From a0de2f6bd3b79f7ab61ea90f795b964a7f7f3d6d Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Mon, 20 Sep 2010 02:29:05 -0600 Subject: [PATCH] conflict_rename_delete(): 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 Signed-off-by: Junio C Hamano --- merge-recursive.c | 8 ++++++++ t/t6022-merge-rename.sh | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index ffcecc7f4..09ce327c1 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -807,6 +807,8 @@ static void conflict_rename_delete(struct merge_options *o, const char *other_branch) { char *dest_name = pair->two->path; + int df_conflict = 0; + struct stat st; output(o, 1, "CONFLICT (rename/delete): Rename %s->%s in %s " "and deleted in %s", @@ -817,7 +819,13 @@ static void conflict_rename_delete(struct merge_options *o, rename_branch == o->branch1 ? pair->two : NULL, rename_branch == o->branch1 ? NULL : pair->two, 1); + if (lstat(dest_name, &st) == 0 && S_ISDIR(st.st_mode)) { + dest_name = unique_path(o, dest_name, rename_branch); + df_conflict = 1; + } update_file(o, 0, pair->two->sha1, pair->two->mode, dest_name); + if (df_conflict) + free(dest_name); } static void conflict_rename_rename_1to2(struct merge_options *o, diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh index edbfa477c..9bf190e03 100755 --- a/t/t6022-merge-rename.sh +++ b/t/t6022-merge-rename.sh @@ -549,7 +549,7 @@ test_expect_success 'setup both rename source and destination involved in D/F co git commit -m "Conflicts in the way" ' -test_expect_failure 'both rename source and destination involved in D/F conflict' ' +test_expect_success 'both rename source and destination involved in D/F conflict' ' git reset --hard && rm -rf dir~* && git checkout -q rename-dest^0 && @@ -589,7 +589,7 @@ test_expect_success 'setup pair rename to parent of other (D/F conflicts)' ' git commit -m "Rename one/file -> two" ' -test_expect_failure 'pair rename to parent of other (D/F conflicts) w/ untracked dir' ' +test_expect_success 'pair rename to parent of other (D/F conflicts) w/ untracked dir' ' git checkout -q rename-one^0 && mkdir one && test_must_fail git merge --strategy=recursive rename-two && -- 2.26.2