merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir

In merge-recursive.c, whenever there was a rename where a file name on one side of the rename matches a directory name on the other side of the merge, then the very first check that string_list_has_string(&o->current_directory_set, ren1_dst) would trigger forcing it into marking it as a rename/directory conflict. However, if the path is only renamed on one side and a simple three-way merge between the separate files resolves cleanly, then we don't need to mark it as a rename/directory conflict. So, we can simply move the check for rename/directory conflicts after we've verified that there isn't a rename/rename conflict and that a threeway content merge doesn't work. This changes the particular error message one gets in the case where the directory name that a file on one side of the rename matches is not also part of the rename pair. For example, with commits containing the files: COMMON -> (HEAD, MERGE ) --------- --------------- ------- sub/file1 -> (sub/file1, newsub) <NULL> -> (newsub/newfile, <NULL>) then previously when one tried to merge MERGE into HEAD, one would get CONFLICT (rename/directory): Rename sub/file1->newsub in HEAD directory newsub added in merge Renaming sub/file1 to newsub~HEAD instead Adding newsub/newfile Automatic merge failed; fix conflicts and then commit the result. After this patch, the error message will instead become: Removing newsub Adding newsub/newfile CONFLICT (file/directory): There is a directory with name newsub in merge. Adding newsub as newsub~HEAD Automatic merge failed; fix conflicts and then commit the result. That makes more sense to me, because git can't know that there's a conflict until after it's tried resolving paths involving newsub/newfile to see if they are still in the way at the end (and if newsub/newfile is not in the way at the end, there should be no conflict at all, which did not hold with git previously). Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Elijah Newren committed Sep 8, 2010 at 00:40 UTC 86273e5764ab7faaa84c3de1a428ed24a6cfdf1f

2 files changed +10 -10

merge-recursive.c

+8 -8

@@ -935,14 +935,7 @@ static int process_renames(struct merge_options *o,

935

936 try_merge = 0;

937

938 - if (string_list_has_string(&o->current_directory_set, ren1_dst)) {

939 - clean_merge = 0;

940 - output(o, 1, "CONFLICT (rename/directory): Rename %s->%s in %s "

941 - " directory %s added in %s",

942 - ren1_src, ren1_dst, branch1,

943 - ren1_dst, branch2);

944 - conflict_rename_dir(o, ren1, branch1);

945 - } else if (sha_eq(src_other.sha1, null_sha1)) {

938 + if (sha_eq(src_other.sha1, null_sha1)) {

939 clean_merge = 0;

940 output(o, 1, "CONFLICT (rename/delete): Rename %s->%s in %s "

941 "and deleted in %s",

@@ -1034,6 +1027,13 @@ static int process_renames(struct merge_options *o,

1027 if (!ren1->dst_entry->stages[2].mode !=

1028 !ren1->dst_entry->stages[3].mode)

1029 ren1->dst_entry->processed = 0;

1030 + } else if (string_list_has_string(&o->current_directory_set, ren1_dst)) {

1031 + clean_merge = 0;

1032 + output(o, 1, "CONFLICT (rename/directory): Rename %s->%s in %s "

1033 + " directory %s added in %s",

1034 + ren1_src, ren1_dst, branch1,

1035 + ren1_dst, branch2);

1036 + conflict_rename_dir(o, ren1, branch1);

1037 } else {

1038 if (mfi.merge || !mfi.clean)

1039 output(o, 1, "Renaming %s => %s", ren1_src, ren1_dst);

t/t3509-cherry-pick-merge-df.sh

+2 -2

@@ -58,7 +58,7 @@ test_expect_success 'Cherry-pick succeeds with was_a_dir/file -> was_a_dir (reso

58 git cherry-pick --strategy=resolve simple

59 '

61 -test_expect_failure 'Cherry-pick succeeds with was_a_dir/file -> was_a_dir (recursive)' '

61 +test_expect_success 'Cherry-pick succeeds with was_a_dir/file -> was_a_dir (recursive)' '

62 git reset --hard &&

63 git checkout -q nick-testcase^0 &&

64 git cherry-pick --strategy=recursive simple

@@ -92,7 +92,7 @@ test_expect_success 'Cherry-pick with rename to different D/F conflict succeeds

92 git cherry-pick --strategy=resolve mergeme

93 '

95 -test_expect_failure 'Cherry-pick with rename to different D/F conflict succeeds (recursive)' '

95 +test_expect_success 'Cherry-pick with rename to different D/F conflict succeeds (recursive)' '

96 git reset --hard &&

97 git checkout -q newhead^0 &&

98 git cherry-pick --strategy=recursive mergeme