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 <gitster@pobox.com>
Junio C Hamano committed
Aug 23, 2008 at 19:23 UTC
e596cdddf349b244dca854bf5a7aa9428b48fc50
1 file changed
+5
-2
t/t7606-merge-custom.sh
+5
-2
@@ -24,8 +24,9 @@ test_expect_success 'setup' '
24
git commit -m c1 &&
25
git tag c1 &&
26
git reset --hard c0 &&
27
+ echo c1c1 >c1.c &&
28
echo c2 >c2.c &&
28
- git add c2.c &&
29
+ git add c1.c c2.c &&
30
git commit -m c2 &&
31
git tag c2
32
'
@@ -38,8 +39,10 @@ test_expect_success 'merge c2 with a custom strategy' '
39
test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
40
test "$(git rev-parse c2^{tree})" = "$(git rev-parse HEAD^{tree})" &&
41
git diff --exit-code &&
42
+ git diff --exit-code c2 HEAD &&
43
+ git diff --exit-code c2 &&
44
test -f c0.c &&
42
- test ! -f c1.c &&
45
+ grep c1c1 c1.c &&
46
test -f c2.c
47
'
48