diff options
| author | Tay Ray Chuan <rctay89@gmail.com> | 2010-05-11 01:17:45 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-10 11:57:31 -0700 |
| commit | 5f35afadb032e1d2585f6f0246bf05f2e4e49c27 (patch) | |
| tree | 54328782d9b69d7abb3669b02bacd18aaa6f8934 /t/t7604-merge-custom-message.sh | |
| parent | d599e0484f8ebac8cc50e9557a4c3d246826843d (diff) | |
| download | git-5f35afadb032e1d2585f6f0246bf05f2e4e49c27.tar.gz | |
t7604-merge-custom-message: shift expected output creation
Squash in a minor rename too.
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7604-merge-custom-message.sh')
| -rwxr-xr-x | t/t7604-merge-custom-message.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/t/t7604-merge-custom-message.sh b/t/t7604-merge-custom-message.sh index 269cfdf267..d79542d847 100755 --- a/t/t7604-merge-custom-message.sh +++ b/t/t7604-merge-custom-message.sh @@ -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 |