From: Tay Ray Chuan Date: Mon, 10 May 2010 17:17:46 +0000 (+0800) Subject: t7604-merge-custom-message: show that --log doesn't append to -m X-Git-Tag: v1.7.2-rc0~60^2~6 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d4e6c4bdc3e065f738b0c2fc47d9fe9c3778d746;p=git.git t7604-merge-custom-message: show that --log doesn't append to -m 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 d79542d84..af53df1c1 100755 --- a/t/t7604-merge-custom-message.sh +++ b/t/t7604-merge-custom-message.sh @@ -8,6 +8,11 @@ Testing merge when using a custom message for the merge commit.' create_merge_msgs() { echo >exp.subject "custom message" + + cp exp.subject exp.log && + echo >>exp.log "" && + echo >>exp.log "* commit 'c2':" && + echo >>exp.log " c2" } test_expect_success 'setup' ' @@ -35,4 +40,11 @@ test_expect_success 'merge c2 with a custom message' ' test_cmp exp.subject actual ' +test_expect_failure 'merge --log appends to custom message' ' + git reset --hard c1 && + git merge --log -m "$(cat exp.subject)" c2 && + git cat-file commit HEAD | sed -e "1,/^$/d" >actual && + test_cmp exp.log actual +' + test_done