handle_delete_modify(): Check whether D/F conflicts are still present

If all the paths below some directory involved in a D/F conflict were not
removed during the rest of the merge, then the contents of the file whose
path conflicted needs to be recorded in file with an alternative filename.

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 a3f986d874e6ee703d989f7ab365b568ba09de7e..0271d16c66ba88219d37f6d523a5add4ce9f835a 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1164,25 +1164,29 @@ error_return:
 
 static void handle_delete_modify(struct merge_options *o,
                                 const char *path,
+                                const char *new_path,
                                 unsigned char *a_sha, int a_mode,
                                 unsigned char *b_sha, int b_mode)
 {
        if (!a_sha) {
                output(o, 1, "CONFLICT (delete/modify): %s deleted in %s "
-                      "and modified in %s. Version %s of %s left in tree.",
+                      "and modified in %s. Version %s of %s left in tree%s%s.",
                       path, o->branch1,
-                      o->branch2, o->branch2, path);
-               update_file(o, 0, b_sha, b_mode, path);
+                      o->branch2, o->branch2, path,
+                      path == new_path ? "" : " at ",
+                      path == new_path ? "" : new_path);
+               update_file(o, 0, b_sha, b_mode, new_path);
        } else {
                output(o, 1, "CONFLICT (delete/modify): %s deleted in %s "
-                      "and modified in %s. Version %s of %s left in tree.",
+                      "and modified in %s. Version %s of %s left in tree%s%s.",
                       path, o->branch2,
-                      o->branch1, o->branch1, path);
-               update_file(o, 0, a_sha, a_mode, path);
+                      o->branch1, o->branch1, path,
+                      path == new_path ? "" : " at ",
+                      path == new_path ? "" : new_path);
+               update_file(o, 0, a_sha, a_mode, new_path);
        }
 }
 
-
 static int merge_content(struct merge_options *o,
                         const char *path,
                         unsigned char *o_sha, int o_mode,
@@ -1281,7 +1285,7 @@ static int process_entry(struct merge_options *o,
                } else {
                        /* Deleted in one and changed in the other */
                        clean_merge = 0;
-                       handle_delete_modify(o, path,
+                       handle_delete_modify(o, path, path,
                                             a_sha, a_mode, b_sha, b_mode);
                }
 
@@ -1398,8 +1402,11 @@ static int process_df_entry(struct merge_options *o,
                }
        } else if (o_sha && (!a_sha || !b_sha)) {
                /* Modify/delete; deleted side may have put a directory in the way */
+               const char *new_path = path;
+               if (lstat(path, &st) == 0 && S_ISDIR(st.st_mode))
+                       new_path = unique_path(o, path, a_sha ? o->branch1 : o->branch2);
                clean_merge = 0;
-               handle_delete_modify(o, path,
+               handle_delete_modify(o, path, new_path,
                                     a_sha, a_mode, b_sha, b_mode);
        } else if (!o_sha && !!a_sha != !!b_sha) {
                /* directory -> (directory, file) */

diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh
index bc9db1a0f0826b030abf8d275de2c252f36d1fd1..7b1ce82707b8c2eed7e65e521e6dedf2a6070523 100755 (executable)
--- a/t/t6020-merge-df.sh
+++ b/t/t6020-merge-df.sh
@@ -71,7 +71,7 @@ test_expect_success 'setup modify/delete + directory/file conflict' '
        git commit -m deleted
 '
 
-test_expect_failure 'modify/delete + directory/file conflict' '
+test_expect_success 'modify/delete + directory/file conflict' '
        git checkout delete^0 &&
        test_must_fail git merge modify &&