From: Tay Ray Chuan Date: Mon, 10 May 2010 17:17:45 +0000 (+0800) Subject: t7604-merge-custom-message: shift expected output creation X-Git-Tag: v1.7.2-rc0~60^2~7 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5f35afadb032e1d2585f6f0246bf05f2e4e49c27;p=git.git t7604-merge-custom-message: shift expected output creation Squash in a minor rename too. Signed-off-by: Tay Ray Chuan Signed-off-by: Junio C Hamano --- diff --git a/t/t7604-merge-custom-message.sh b/t/t7604-merge-custom-message.sh index 269cfdf26..d79542d84 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