From 5f35afadb032e1d2585f6f0246bf05f2e4e49c27 Mon Sep 17 00:00:00 2001 From: Tay Ray Chuan Date: Tue, 11 May 2010 01:17:45 +0800 Subject: 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 --- t/t7604-merge-custom-message.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 't') 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 -- cgit v1.2.1 From d4e6c4bdc3e065f738b0c2fc47d9fe9c3778d746 Mon Sep 17 00:00:00 2001 From: Tay Ray Chuan Date: Tue, 11 May 2010 01:17:46 +0800 Subject: t7604-merge-custom-message: show that --log doesn't append to -m Signed-off-by: Tay Ray Chuan Signed-off-by: Junio C Hamano --- t/t7604-merge-custom-message.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 't') diff --git a/t/t7604-merge-custom-message.sh b/t/t7604-merge-custom-message.sh index d79542d847..af53df1c1b 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 -- cgit v1.2.1 From f0ecac2b70bf6b44b89dfa493abd2f544010b1eb Mon Sep 17 00:00:00 2001 From: Tay Ray Chuan Date: Tue, 11 May 2010 01:17:52 +0800 Subject: merge: --log appends shortlog to message if specified When the user specifies a message, use fmt_merge_msg_shortlog() to append the shortlog. Previously, when a message was specified, we ignored the merge title ("Merge into ") and shortlog from fmt_merge_msg(). Update the documentation for -m to reflect this too. Signed-off-by: Tay Ray Chuan Signed-off-by: Junio C Hamano --- t/t7604-merge-custom-message.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't') diff --git a/t/t7604-merge-custom-message.sh b/t/t7604-merge-custom-message.sh index af53df1c1b..9114785ef7 100755 --- a/t/t7604-merge-custom-message.sh +++ b/t/t7604-merge-custom-message.sh @@ -40,7 +40,7 @@ test_expect_success 'merge c2 with a custom message' ' test_cmp exp.subject actual ' -test_expect_failure 'merge --log appends to custom message' ' +test_expect_success '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 && -- cgit v1.2.1