mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recursive: Fix recursive case with D/F conflict via add/add conflict

Browse Source 
When a D/F conflict is introduced via an add/add conflict, when
o->call_depth > 0 we need to ensure that the higher stage entry from the
base stage is removed.

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:19:55 -06:00
committed by Junio C Hamano
parent 0b30e81251
commit 7b1c610f84
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
merge-recursive.c
View File

@ -1466,6 +1466,8 @@ static int process_df_entry(struct merge_options *o,
"Adding %s as %s", "Adding %s as %s",
conf, path, other_branch, path, new_path); conf, path, other_branch, path, new_path);
update_file(o, 0, sha, mode, new_path); update_file(o, 0, sha, mode, new_path);
if (o->call_depth)
remove_file_from_cache(path);
free(new_path); free(new_path);
} else { } else {
output(o, 2, "Adding %s", path); output(o, 2, "Adding %s", path);

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

@ -509,7 +509,7 @@ test_expect_failure 'merge of D & E1 fails but has appropriate contents' '
test $(git rev-parse :2:a) = $(git rev-parse B:a) test $(git rev-parse :2:a) = $(git rev-parse B:a)
' '
test_expect_failure 'merge of E1 & D fails but has appropriate contents' ' test_expect_success 'merge of E1 & D fails but has appropriate contents' '
get_clean_checkout E1^0 && get_clean_checkout E1^0 &&
test_must_fail git merge -s recursive D^0 && test_must_fail git merge -s recursive D^0 &&
@ -539,7 +539,7 @@ test_expect_success 'merge of D & E2 fails but has appropriate contents' '
test -f a~HEAD test -f a~HEAD
' '
test_expect_failure 'merge of E2 & D fails but has appropriate contents' ' test_expect_success 'merge of E2 & D fails but has appropriate contents' '
get_clean_checkout E2^0 && get_clean_checkout E2^0 &&
test_must_fail git merge -s recursive D^0 && test_must_fail git merge -s recursive D^0 &&