merge-recursive: Move handling of double rename of one file to two

Move the handling of rename/rename conflicts where one file is renamed to
two different files, from process_renames() to process_df_entry().

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/merge-recursive.c b/merge-recursive.c
index 6ffc67ade4dc0ceee604596d4a5fb6baad42ac43..d0c68ce2b4d7e84d824a38744e3b15e91b54db9c 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -855,8 +855,11 @@ static void conflict_rename_rename_1to2(struct merge_options *o,
                 * update_file(o, 0, pair2->two->sha1, pair2->two->mode, dst_name2);
                 */
        } else {
                 * update_file(o, 0, pair2->two->sha1, pair2->two->mode, dst_name2);
                 */
        } else {

-               update_stages(dst_name1, NULL, pair1->two, NULL, 1);
-               update_stages(dst_name2, NULL, NULL, pair2->two, 1);
+               update_stages(ren1_dst, NULL, pair1->two, NULL, 1);
+               update_stages(ren2_dst, NULL, NULL, pair2->two, 1);
+
+               update_file(o, 0, pair1->two->sha1, pair1->two->mode, dst_name1);
+               update_file(o, 0, pair2->two->sha1, pair2->two->mode, dst_name2);

        }
        while (delp--)
                free(del[delp]);
        }
        while (delp--)
                free(del[delp]);


@@ -958,19 +961,15 @@ static int process_renames(struct merge_options *o,
                        ren2->dst_entry->processed = 1;
                        ren2->processed = 1;
                        if (strcmp(ren1_dst, ren2_dst) != 0) {
                        ren2->dst_entry->processed = 1;
                        ren2->processed = 1;
                        if (strcmp(ren1_dst, ren2_dst) != 0) {

-                               clean_merge = 0;
-                               output(o, 1, "CONFLICT (rename/rename): "
-                                      "Rename \"%s\"->\"%s\" in branch \"%s\" "
-                                      "rename \"%s\"->\"%s\" in \"%s\"%s",
-                                      src, ren1_dst, branch1,
-                                      src, ren2_dst, branch2,
-                                      o->call_depth ? " (left unresolved)": "");
-                               if (o->call_depth) {
-                                       remove_file_from_cache(src);
-                                       update_file(o, 0, ren1->pair->one->sha1,
-                                                   ren1->pair->one->mode, src);
-                               }
-                               conflict_rename_rename_1to2(o, ren1->pair, branch1, ren2->pair, branch2);
+                               setup_rename_df_conflict_info(RENAME_ONE_FILE_TO_TWO,
+                                                             ren1->pair,
+                                                             ren2->pair,
+                                                             branch1,
+                                                             branch2,
+                                                             ren1->dst_entry,
+                                                             ren2->dst_entry);
+                               remove_file(o, 0, ren1_dst, 0);
+                               /* ren2_dst not in head, so no need to delete */

                        } else {
                                struct merge_file_info mfi;
                                remove_file(o, 1, ren1_src, 1);
                        } else {
                                struct merge_file_info mfi;
                                remove_file(o, 1, ren1_src, 1);


@@ -1364,7 +1363,33 @@ static int process_df_entry(struct merge_options *o,
 
        entry->processed = 1;
        if (entry->rename_df_conflict_info) {
 
        entry->processed = 1;
        if (entry->rename_df_conflict_info) {

-               die("Not yet implemented.");
+               struct rename_df_conflict_info *conflict_info = entry->rename_df_conflict_info;
+               char *src;
+               switch (conflict_info->rename_type) {
+               case RENAME_ONE_FILE_TO_TWO:
+                       src = conflict_info->pair1->one->path;
+                       clean_merge = 0;
+                       output(o, 1, "CONFLICT (rename/rename): "
+                              "Rename \"%s\"->\"%s\" in branch \"%s\" "
+                              "rename \"%s\"->\"%s\" in \"%s\"%s",
+                              src, conflict_info->pair1->two->path, conflict_info->branch1,
+                              src, conflict_info->pair2->two->path, conflict_info->branch2,
+                              o->call_depth ? " (left unresolved)" : "");
+                       if (o->call_depth) {
+                               remove_file_from_cache(src);
+                               update_file(o, 0, conflict_info->pair1->one->sha1,
+                                           conflict_info->pair1->one->mode, src);
+                       }
+                       conflict_rename_rename_1to2(o, conflict_info->pair1,
+                                                   conflict_info->branch1,
+                                                   conflict_info->pair2,
+                                                   conflict_info->branch2);
+                       conflict_info->dst_entry2->processed = 1;
+                       break;
+               default:
+                       entry->processed = 0;
+                       break;
+               }

        } else if (!o_sha && !!a_sha != !!b_sha) {
                /* directory -> (directory, file) */
                const char *add_branch;
        } else if (!o_sha && !!a_sha != !!b_sha) {
                /* directory -> (directory, file) */
                const char *add_branch;

diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh
index 02dea16459f54f468aec9d68adfc345a40453e37..1f29c0a94d672d75b76743ba8a8edf1558401987 100755 (executable)
--- a/t/t6022-merge-rename.sh
+++ b/t/t6022-merge-rename.sh
@@ -652,7 +652,7 @@ test_expect_success 'setup rename of one file to two, with directories in the wa
        git commit -m "Put one/file in the way, rename to two"
 '
 
        git commit -m "Put one/file in the way, rename to two"
 '
 

-test_expect_failure 'check handling of differently renamed file with D/F conflicts' '
+test_expect_success 'check handling of differently renamed file with D/F conflicts' '

        git checkout -q first-rename^0 &&
        test_must_fail git merge --strategy=recursive second-rename &&
 
        git checkout -q first-rename^0 &&
        test_must_fail git merge --strategy=recursive second-rename &&