undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Elijah Newren 2010-09-20 02:29:07 -06:00 committed by Junio C Hamano
parent 2adc7dcc11
commit 4ab9a157d0
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
merge-recursive.c
View File

@ -1193,6 +1193,8 @@ static int merge_content(struct merge_options *o,
const char *reason = "content"; const char *reason = "content";
struct merge_file_info mfi; struct merge_file_info mfi;
struct diff_filespec one, a, b; struct diff_filespec one, a, b;
struct stat st;
unsigned df_conflict_remains = 0;
if (!o_sha) { if (!o_sha) {
reason = "add/add"; reason = "add/add";
@ -1207,7 +1209,13 @@ static int merge_content(struct merge_options *o,
b.mode = b_mode; b.mode = b_mode;
mfi = merge_file(o, &one, &a, &b, o->branch1, o->branch2); mfi = merge_file(o, &one, &a, &b, o->branch1, o->branch2);
if (mfi.clean && sha_eq(mfi.sha, a_sha) && mfi.mode == a.mode) if (df_rename_conflict_branch &&
lstat(path, &st) == 0 && S_ISDIR(st.st_mode)) {
df_conflict_remains = 1;
}
if (mfi.clean && !df_conflict_remains &&
sha_eq(mfi.sha, a_sha) && mfi.mode == a.mode)
output(o, 3, "Skipped %s (merged same as existing)", path); output(o, 3, "Skipped %s (merged same as existing)", path);
else else
output(o, 2, "Auto-merging %s", path); output(o, 2, "Auto-merging %s", path);
@ -1219,7 +1227,17 @@ static int merge_content(struct merge_options *o,
reason, path); reason, path);
} }
update_file(o, mfi.clean, mfi.sha, mfi.mode, path); if (df_conflict_remains) {
const char *new_path;
update_file_flags(o, mfi.sha, mfi.mode, path,
o->call_depth || mfi.clean, 0);
new_path = unique_path(o, path, df_rename_conflict_branch);
mfi.clean = 0;
output(o, 1, "Adding as %s instead", new_path);
update_file_flags(o, mfi.sha, mfi.mode, new_path, 0, 1);
} else {
update_file(o, mfi.clean, mfi.sha, mfi.mode, path);
}
return mfi.clean; return mfi.clean;
} }

8
t/t6022-merge-rename.sh
View File

@ -394,7 +394,7 @@ test_expect_success 'Rename+D/F conflict; renamed file merges + dir not in way'
test_cmp expected dir test_cmp expected dir
' '
test_expect_failure 'Rename+D/F conflict; renamed file merges but dir in way' ' test_expect_success 'Rename+D/F conflict; renamed file merges but dir in way' '
git reset --hard && git reset --hard &&
rm -rf dir~* && rm -rf dir~* &&
git checkout -q renamed-file-has-no-conflicts^0 && git checkout -q renamed-file-has-no-conflicts^0 &&
@ -415,7 +415,7 @@ test_expect_failure 'Rename+D/F conflict; renamed file merges but dir in way' '
test_cmp expected dir~HEAD test_cmp expected dir~HEAD
' '
test_expect_failure 'Same as previous, but merged other way' ' test_expect_success 'Same as previous, but merged other way' '
git reset --hard && git reset --hard &&
rm -rf dir~* && rm -rf dir~* &&
git checkout -q dir-in-way^0 && git checkout -q dir-in-way^0 &&
@ -471,7 +471,7 @@ test_expect_success 'Rename+D/F conflict; renamed file cannot merge, dir not in
test_cmp expected dir test_cmp expected dir
' '
test_expect_failure 'Rename+D/F conflict; renamed file cannot merge and dir in the way' ' test_expect_success 'Rename+D/F conflict; renamed file cannot merge and dir in the way' '
modify s/dir-not-in-way/dir-in-way/ expected && modify s/dir-not-in-way/dir-in-way/ expected &&
git reset --hard && git reset --hard &&
@ -509,7 +509,7 @@ cat >expected <<\EOF &&
>>>>>>> renamed-file-has-conflicts >>>>>>> renamed-file-has-conflicts
EOF EOF
test_expect_failure 'Same as previous, but merged other way' ' test_expect_success 'Same as previous, but merged other way' '
git reset --hard && git reset --hard &&
rm -rf dir~* && rm -rf dir~* &&
git checkout -q dir-in-way^0 && git checkout -q dir-in-way^0 &&