conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts
This function is called from process_df_entry(), near the end of the merge. Rather than just checking whether one of the sides of the merge had a directory at the same path as one of our files, check whether that directory is still present by this point of our merge. 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:29 UTC
2adc7dcc111636ed16601dc7516ced1c5cfda088
2 files changed
+4
-5
merge-recursive.c
+3
-4
@@ -841,17 +841,16 @@ static void conflict_rename_rename_1to2(struct merge_options *o,
841
const char *ren2_dst = pair2->two->path;
842
const char *dst_name1 = ren1_dst;
843
const char *dst_name2 = ren2_dst;
844
- if (string_list_has_string(&o->current_directory_set, ren1_dst)) {
844
+ struct stat st;
845
+ if (lstat(ren1_dst, &st) == 0 && S_ISDIR(st.st_mode)) {
846
dst_name1 = del[delp++] = unique_path(o, ren1_dst, branch1);
847
output(o, 1, "%s is a directory in %s adding as %s instead",
848
ren1_dst, branch2, dst_name1);
848
- remove_file(o, 0, ren1_dst, 0);
849
}
850
- if (string_list_has_string(&o->current_directory_set, ren2_dst)) {
850
+ if (lstat(ren2_dst, &st) == 0 && S_ISDIR(st.st_mode)) {
851
dst_name2 = del[delp++] = unique_path(o, ren2_dst, branch2);
852
output(o, 1, "%s is a directory in %s adding as %s instead",
853
ren2_dst, branch1, dst_name2);
854
- remove_file(o, 0, ren2_dst, 0);
854
}
855
if (o->call_depth) {
856
remove_file_from_cache(dst_name1);
t/t6022-merge-rename.sh
+1
-1
@@ -692,7 +692,7 @@ test_expect_success 'setup rename one file to two; directories moving out of the
692
git commit -m "Rename to two"
693
'
694
695
-test_expect_failure 'check handling of differently renamed file with D/F conflicts' '
695
+test_expect_success 'check handling of differently renamed file with D/F conflicts' '
696
git checkout -q first-rename-redo^0 &&
697
test_must_fail git merge --strategy=recursive second-rename-redo &&
698