development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-12 21:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

t7604-merge-custom-message: shift expected output creation

Browse source 
Squash in a minor rename too.

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Tay Ray Chuan 2010-05-11 01:17:45 +08:00 committed by Junio C Hamano
parent d599e0484f
commit 5f35afadb0
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
t/t7604-merge-custom-message.sh
View file

@ -6,6 +6,10 @@ Testing merge when using a custom message for the merge commit.'
. ./test-lib.sh
create_merge_msgs() {
echo >exp.subject "custom message"
}
test_expect_success 'setup' '
echo c0 > c0.c &&
git add c0.c &&
@ -19,16 +23,16 @@ test_expect_success 'setup' '
echo c2 > c2.c &&
git add c2.c &&
git commit -m c2 &&
git tag c2
git tag c2 &&
create_merge_msgs
'
test_expect_success 'merge c2 with a custom message' '
git reset --hard c1 &&
echo >expected "custom message" &&
git merge -m "custom message" c2 &&
git merge -m "$(cat exp.subject)" c2 &&
git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
test_cmp expected actual
test_cmp exp.subject actual
'
test_done