diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:25:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-29 17:25:28 -0700 |
| commit | a1155adc2dde23fd664ad47399379cd0561762af (patch) | |
| tree | d7cc6994bc7f98b40e65d854af67f460d4e94ec3 /merge-recursive.c | |
| parent | 87b50542a08ac6caa083ddc376e674424e37940a (diff) | |
| parent | 86273e5764ab7faaa84c3de1a428ed24a6cfdf1f (diff) | |
| download | git-a1155adc2dde23fd664ad47399379cd0561762af.tar.gz | |
Merge branch 'en/rename-d-f' into en/merge-recursive
* en/rename-d-f:
merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
t3509: Add rename + D/F conflict testcase that recursive strategy fails
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index c574698819..51c0536d4e 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -935,14 +935,7 @@ static int process_renames(struct merge_options *o, try_merge = 0; - if (string_list_has_string(&o->current_directory_set, ren1_dst)) { - clean_merge = 0; - output(o, 1, "CONFLICT (rename/directory): Rename %s->%s in %s " - " directory %s added in %s", - ren1_src, ren1_dst, branch1, - ren1_dst, branch2); - conflict_rename_dir(o, ren1, branch1); - } else if (sha_eq(src_other.sha1, null_sha1)) { + if (sha_eq(src_other.sha1, null_sha1)) { clean_merge = 0; output(o, 1, "CONFLICT (rename/delete): Rename %s->%s in %s " "and deleted in %s", @@ -1040,6 +1033,13 @@ static int process_renames(struct merge_options *o, if (!ren1->dst_entry->stages[2].mode != !ren1->dst_entry->stages[3].mode) ren1->dst_entry->processed = 0; + } else if (string_list_has_string(&o->current_directory_set, ren1_dst)) { + clean_merge = 0; + output(o, 1, "CONFLICT (rename/directory): Rename %s->%s in %s " + " directory %s added in %s", + ren1_src, ren1_dst, branch1, + ren1_dst, branch2); + conflict_rename_dir(o, ren1, branch1); } else { if (mfi.merge || !mfi.clean) output(o, 1, "Renaming %s => %s", ren1_src, ren1_dst); |