index 6081677d234f1fcb88b6b9160f707ebf0274f38a..269cfdf267443f67ef8c6c921610bc856f4e506b 100755 (executable)
#!/bin/sh
-test_description='git-merge
+test_description='git merge
Testing merge when using a custom message for the merge commit.'
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 &&
+ echo >expected "custom message" &&
git merge -m "custom message" c2 &&
- git cat-file commit HEAD | sed -e "1,/^$/d" > actual &&
+ git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
test_cmp expected actual
'