proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-06 05:01:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2294 from ethomson/merge_checkout_strategy

Browse Source 
Merge checkout strategy
This commit is contained in:
Russell Belfer 2014-04-24 16:20:08 -07:00
commit af9eeac939
3 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/merge.c
View File

@ -2186,8 +2186,6 @@ static int merge_normalize_checkout_opts(
const git_merge_head **their_heads) const git_merge_head **their_heads)
{ {
int error = 0; int error = 0;
unsigned int default_checkout_strategy = GIT_CHECKOUT_SAFE_CREATE |
GIT_CHECKOUT_ALLOW_CONFLICTS;
GIT_UNUSED(repo); GIT_UNUSED(repo);
@ -2195,12 +2193,12 @@ static int merge_normalize_checkout_opts(
memcpy(checkout_opts, given_checkout_opts, sizeof(git_checkout_options)); memcpy(checkout_opts, given_checkout_opts, sizeof(git_checkout_options));
else { else {
git_checkout_options default_checkout_opts = GIT_CHECKOUT_OPTIONS_INIT; git_checkout_options default_checkout_opts = GIT_CHECKOUT_OPTIONS_INIT;
default_checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE |
GIT_CHECKOUT_ALLOW_CONFLICTS;
memcpy(checkout_opts, &default_checkout_opts, sizeof(git_checkout_options)); memcpy(checkout_opts, &default_checkout_opts, sizeof(git_checkout_options));
} }
if (!checkout_opts->checkout_strategy)
checkout_opts->checkout_strategy = default_checkout_strategy;
/* TODO: for multiple ancestors in merge-recursive, this is "merged common ancestors" */ /* TODO: for multiple ancestors in merge-recursive, this is "merged common ancestors" */
if (!checkout_opts->ancestor_label) { if (!checkout_opts->ancestor_label) {
if (ancestor_head && ancestor_head->commit) if (ancestor_head && ancestor_head->commit)

30
tests/merge/workdir/dirty.c
View File

@ -86,7 +86,7 @@ static void set_core_autocrlf_to(git_repository *repo, bool value)
git_config_free(cfg); git_config_free(cfg);
} }
static int merge_branch(int merge_file_favor, int checkout_strategy) static int merge_branch(void)
{ {
git_oid their_oids[1]; git_oid their_oids[1];
git_merge_head *their_heads[1]; git_merge_head *their_heads[1];
@ -97,8 +97,7 @@ static int merge_branch(int merge_file_favor, int checkout_strategy)
cl_git_pass(git_oid_fromstr(&their_oids[0], MERGE_BRANCH_OID)); cl_git_pass(git_oid_fromstr(&their_oids[0], MERGE_BRANCH_OID));
cl_git_pass(git_merge_head_from_id(&their_heads[0], repo, &their_oids[0])); cl_git_pass(git_merge_head_from_id(&their_heads[0], repo, &their_oids[0]));
merge_opts.file_favor = merge_file_favor; checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_ALLOW_CONFLICTS;
checkout_opts.checkout_strategy = checkout_strategy;
error = git_merge(repo, (const git_merge_head **)their_heads, 1, &merge_opts, &checkout_opts); error = git_merge(repo, (const git_merge_head **)their_heads, 1, &merge_opts, &checkout_opts);
git_merge_head_free(their_heads[0]); git_merge_head_free(their_heads[0]);
@ -214,7 +213,7 @@ static int merge_dirty_files(char *dirty_files[])
write_files(dirty_files); write_files(dirty_files);
error = merge_branch(0, 0); error = merge_branch();
git_object_free(head_object); git_object_free(head_object);
git_reference_free(head); git_reference_free(head);
@ -237,7 +236,7 @@ static int merge_differently_filtered_files(char *files[])
cl_git_pass(git_index_write(repo_index)); cl_git_pass(git_index_write(repo_index));
error = merge_branch(0, 0); error = merge_branch();
git_object_free(head_object); git_object_free(head_object);
git_reference_free(head); git_reference_free(head);
@ -248,7 +247,7 @@ static int merge_differently_filtered_files(char *files[])
static int merge_staged_files(char *staged_files[]) static int merge_staged_files(char *staged_files[])
{ {
stage_random_files(staged_files); stage_random_files(staged_files);
return merge_branch(0, 0); return merge_branch();
} }
void test_merge_workdir_dirty__unaffected_dirty_files_allowed(void) void test_merge_workdir_dirty__unaffected_dirty_files_allowed(void)
@ -260,6 +259,23 @@ void test_merge_workdir_dirty__unaffected_dirty_files_allowed(void)
cl_git_pass(merge_dirty_files(files)); cl_git_pass(merge_dirty_files(files));
} }
void test_merge_workdir_dirty__unstaged_deletes_maintained(void)
{
git_reference *head;
git_object *head_object;
cl_git_pass(git_repository_head(&head, repo));
cl_git_pass(git_reference_peel(&head_object, head, GIT_OBJ_COMMIT));
cl_git_pass(git_reset(repo, head_object, GIT_RESET_HARD, NULL, NULL));
cl_git_pass(p_unlink("merge-resolve/unchanged.txt"));
cl_git_pass(merge_branch());
git_object_free(head_object);
git_reference_free(head);
}
void test_merge_workdir_dirty__affected_dirty_files_disallowed(void) void test_merge_workdir_dirty__affected_dirty_files_disallowed(void)
{ {
char **files; char **files;
@ -292,7 +308,7 @@ void test_merge_workdir_dirty__identical_staged_files_allowed(void)
stage_content(content); stage_content(content);
git_index_write(repo_index); git_index_write(repo_index);
cl_git_pass(merge_branch(0, 0)); cl_git_pass(merge_branch());
} }
} }

6
tests/merge/workdir/simple.c
View File

@ -92,7 +92,7 @@ void test_merge_workdir_simple__cleanup(void)
cl_git_sandbox_cleanup(); cl_git_sandbox_cleanup();
} }
static void merge_simple_branch(int merge_file_favor, int checkout_strategy) static void merge_simple_branch(int merge_file_favor, int addl_checkout_strategy)
{ {
git_oid their_oids[1]; git_oid their_oids[1];
git_merge_head *their_heads[1]; git_merge_head *their_heads[1];
@ -103,7 +103,9 @@ static void merge_simple_branch(int merge_file_favor, int checkout_strategy)
cl_git_pass(git_merge_head_from_id(&their_heads[0], repo, &their_oids[0])); cl_git_pass(git_merge_head_from_id(&their_heads[0], repo, &their_oids[0]));
merge_opts.file_favor = merge_file_favor; merge_opts.file_favor = merge_file_favor;
checkout_opts.checkout_strategy = checkout_strategy; checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_ALLOW_CONFLICTS |
addl_checkout_strategy;
cl_git_pass(git_merge(repo, (const git_merge_head **)their_heads, 1, &merge_opts, &checkout_opts)); cl_git_pass(git_merge(repo, (const git_merge_head **)their_heads, 1, &merge_opts, &checkout_opts));
git_merge_head_free(their_heads[0]); git_merge_head_free(their_heads[0]);