Skip to content

Commit

Permalink
t7606: fix custom merge test
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Aug 24, 2008
1 parent 131f9a1 commit e596cdd
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions t/t7606-merge-custom.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
'
Expand All @@ -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
'

Expand Down

0 comments on commit e596cdd

Please sign in to comment.