Skip to content

Commit

Permalink
Add new test case to ensure git-merge prepends the custom merge message
Browse files Browse the repository at this point in the history
There was no test for this before, so the testsuite passed, even in case
the merge summary was missing from the merge commit message.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Miklos Vajna authored and Junio C Hamano committed Jul 7, 2008
1 parent f4022fa commit c1fb35b
Showing 1 changed file with 37 additions and 0 deletions.
37 changes: 37 additions & 0 deletions t/t7604-merge-custom-message.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#!/bin/sh

test_description='git-merge
Testing merge when using a custom message for the merge commit.'

. ./test-lib.sh

test_expect_success 'setup' '
echo c0 > c0.c &&
git add c0.c &&
git commit -m c0 &&
git tag c0 &&
echo c1 > c1.c &&
git add c1.c &&
git commit -m c1 &&
git tag c1 &&
git reset --hard c0 &&
echo c2 > c2.c &&
git add c2.c &&
git commit -m c2 &&
git tag c2
'

cat >expected <<\EOF
custom message
Merge commit 'c2'
EOF
test_expect_success 'merge c2 with a custom message' '
git reset --hard c1 &&
git merge -m "custom message" c2 &&
git cat-file commit HEAD | sed -e "1,/^$/d" > actual &&
test_cmp expected actual
'

test_done

0 comments on commit c1fb35b

Please sign in to comment.