diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-18 00:27:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-18 00:28:16 -0800 |
| commit | 03f94ae9f909952ed5a78917ab319a312889354b (patch) | |
| tree | 0fd041e8b390bd0d2a960ae629d8e965d363de92 /t/t7604-merge-custom-message.sh | |
| parent | 2c47789d817aaf745a5ce5d5f79619c634cc8566 (diff) | |
| parent | 81b50f3ce40bfdd66e5d967bf82be001039a9a98 (diff) | |
| download | git-jk/maint-strbuf-missing-init.tar.gz | |
Update jk/maint-strbuf-missing-init to builtin/ renamejk/maint-strbuf-missing-init
Diffstat (limited to 't/t7604-merge-custom-message.sh')
| -rwxr-xr-x | t/t7604-merge-custom-message.sh | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/t/t7604-merge-custom-message.sh b/t/t7604-merge-custom-message.sh index 6081677d23..269cfdf267 100755 --- a/t/t7604-merge-custom-message.sh +++ b/t/t7604-merge-custom-message.sh @@ -1,6 +1,6 @@ #!/bin/sh -test_description='git-merge +test_description='git merge Testing merge when using a custom message for the merge commit.' @@ -22,15 +22,12 @@ test_expect_success 'setup' ' 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 ' |