From e596cdddf349b244dca854bf5a7aa9428b48fc50 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 23 Aug 2008 19:23:22 -0700 Subject: [PATCH] t7606: fix custom merge test Custom merge strategy does not even kick in when the merge is truly trivial. The test depended on the behaviour in the git-merge rewritten in C that broke the trivial merge completely. Make the test to work on a non-trivial merge to make sure the strategy kicks in. Signed-off-by: Junio C Hamano --- t/t7606-merge-custom.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/t/t7606-merge-custom.sh b/t/t7606-merge-custom.sh index 07e0fc797..de9b6ed5b 100755 --- a/t/t7606-merge-custom.sh +++ b/t/t7606-merge-custom.sh @@ -24,8 +24,9 @@ test_expect_success 'setup' ' git commit -m c1 && git tag c1 && git reset --hard c0 && + echo c1c1 >c1.c && echo c2 >c2.c && - git add c2.c && + git add c1.c c2.c && git commit -m c2 && git tag c2 ' @@ -38,8 +39,10 @@ test_expect_success 'merge c2 with a custom strategy' ' test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" && test "$(git rev-parse c2^{tree})" = "$(git rev-parse HEAD^{tree})" && git diff --exit-code && + git diff --exit-code c2 HEAD && + git diff --exit-code c2 && test -f c0.c && - test ! -f c1.c && + grep c1c1 c1.c && test -f c2.c ' -- 2.30.2