merge-recursive: Nuke rename/directory conflict detection
Since we want to resolve merges in-core and then detect at the end whether D/F conflicts remain in the way, we should just apply renames in-core and let logic elsewhere check for D/F conflicts. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Sep 20, 2010 at 02:28 UTC
605c1bcfc46b60f76dfb4f89f76029b7bb13d232
1 file changed
-18
merge-recursive.c
-18
@@ -772,17 +772,6 @@ static void conflict_rename_rename_1to2(struct merge_options *o,
772
free(del[delp]);
773
}
774
775
-static void conflict_rename_dir(struct merge_options *o,
776
- struct rename *ren1,
777
- const char *branch1)
778
-{
779
- char *new_path = unique_path(o, ren1->pair->two->path, branch1);
780
- output(o, 1, "Renaming %s to %s instead", ren1->pair->one->path, new_path);
781
- remove_file(o, 0, ren1->pair->two->path, 0);
782
- update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path);
783
- free(new_path);
784
-}
785
-
775
static void conflict_rename_rename_2to1(struct merge_options *o,
776
struct rename *ren1,
777
const char *branch1,
@@ -1043,13 +1032,6 @@ static int process_renames(struct merge_options *o,
1032
if (!ren1->dst_entry->stages[2].mode !=
1033
!ren1->dst_entry->stages[3].mode)
1034
ren1->dst_entry->processed = 0;
1046
- } else if (string_list_has_string(&o->current_directory_set, ren1_dst)) {
1047
- clean_merge = 0;
1048
- output(o, 1, "CONFLICT (rename/directory): Rename %s->%s in %s "
1049
- " directory %s added in %s",
1050
- ren1_src, ren1_dst, branch1,
1051
- ren1_dst, branch2);
1052
- conflict_rename_dir(o, ren1, branch1);
1035
} else {
1036
if (mfi.merge || !mfi.clean)
1037
output(o, 1, "Renaming %s => %s", ren1_src, ren1_dst);