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

merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest

Browse Source 
Earlier in this series, the patch "merge-recursive: add handling for
rename/rename/add-dest/add-dest" added code to handle the rename on each
side of history also being involved in a rename/add conflict, but only
did so in the non-recursive case.  Add code for the recursive case,
ensuring that the "added" files are not simply deleted.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2011-08-11 23:20:29 -06:00 committed by Junio C Hamano
parent b630b81470
commit 6d63070cac
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
merge-recursive.c
View File

@ -1159,6 +1159,8 @@ static void conflict_rename_rename_1to2(struct merge_options *o,
o->call_depth ? " (left unresolved)" : "");
if (o->call_depth) {
struct merge_file_info mfi;
struct diff_filespec other;
struct diff_filespec *add;
mfi = merge_file(o, one->path,
one->sha1, one->mode,
a->sha1, a->mode,
@ -1171,8 +1173,25 @@ static void conflict_rename_rename_1to2(struct merge_options *o,
* unique path, or use that unique path instead of src here.
*/
update_file(o, 0, mfi.sha, mfi.mode, one->path);
remove_file_from_cache(a->path);
remove_file_from_cache(b->path);
/*
* Above, we put the merged content at the merge-base's
* path. Now we usually need to delete both a->path and
* b->path. However, the rename on each side of the merge
* could also be involved in a rename/add conflict. In
* such cases, we should keep the added file around,
* resolving the conflict at that path in its favor.
*/
add = filespec_from_entry(&other, ci->dst_entry1, 2 ^ 1);
if (add)
update_file(o, 0, add->sha1, add->mode, a->path);
else
remove_file_from_cache(a->path);
add = filespec_from_entry(&other, ci->dst_entry2, 3 ^ 1);
if (add)
update_file(o, 0, add->sha1, add->mode, b->path);
else
remove_file_from_cache(b->path);
} else {
handle_file(o, a, 2, ci);
handle_file(o, b, 3, ci);

2
t/t6036-recursive-corner-cases.sh
View File

@ -760,7 +760,7 @@ test_expect_success 'setup criss-cross+rename/rename/add-dest + simple modify' '
git tag E
'
test_expect_failure 'virtual merge base handles rename/rename(1to2)/add-dest' '
test_expect_success 'virtual merge base handles rename/rename(1to2)/add-dest' '
git checkout D^0 &&
git merge -s recursive E^0 &&