2008-06-27 16:22:07 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
2008-09-03 08:59:33 +00:00
|
|
|
test_description='git merge
|
2008-06-27 16:22:07 +00:00
|
|
|
|
|
|
|
|
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
|
