[PATCHv2 22/56] merge-recursive: Fix recursive case with D/F conflict via add/add conflict
- From
Elijah Newren <newren@gmail.com>
- Date
- Aug 12, 2011, 05:19 UTC
- Message-ID
- <1313126429-17368-23-git-send-email-newren@gmail.com>
- In-Reply-To
- <1313126429-17368-1-git-send-email-newren@gmail.com>
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> --- No changes since v1.
merge-recursive.c | 2 ++ t/t6036-recursive-corner-cases.sh | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c index 8863b02..85620f7 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1468,6 +1468,8 @@ static int process_df_entry(struct merge_options *o, "Adding %s as %s", conf, path, other_branch, path, new_path); update_file(o, 0, sha, mode, new_path); + if (o->call_depth) + remove_file_from_cache(path); free(new_path); } else { output(o, 2, "Adding %s", path); diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh index 526a2ea..ed6c6f4 100755 --- a/t/t6036-recursive-corner-cases.sh +++ b/t/t6036-recursive-corner-cases.sh @@ -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_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 && 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_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 && test_must_fail git merge -s recursive D^0 &&
-- 1.7.6.100.gac5c1