summaryrefslogtreecommitdiff
path: root/t/t7502-commit.sh
diff options
context:
space:
mode:
authorBrandon Casey <drafnel@gmail.com>2013-02-18 20:17:06 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-19 09:30:50 -0800
commita24a41ea9a928ccde2db074ab0835c4817223c9d (patch)
tree01c2ec81dc2213601ef0eac8467068e99747507f /t/t7502-commit.sh
parent5b012c80a165236dde57c386fd62465e9137b2ce (diff)
downloadgit-a24a41ea9a928ccde2db074ab0835c4817223c9d.tar.gz
git-commit: only append a newline to -m mesg if necessary
Currently, git will append two newlines to every message supplied via the -m switch. The purpose of this is to allow -m to be supplied multiple times and have each supplied string become a paragraph in the resulting commit message. Normally, this does not cause a problem since any trailing newlines will be removed by the cleanup operation. If cleanup=verbatim for example, then the trailing newlines will not be removed and will survive into the resulting commit message. Instead, let's ensure that the string supplied to -m is newline terminated, but only append a second newline when appending additional messages. Fixes the test in t7502. Signed-off-by: Brandon Casey <drafnel@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7502-commit.sh')
-rwxr-xr-xt/t7502-commit.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index 39e55f8eca..292bc082b2 100755
--- a/t/t7502-commit.sh
+++ b/t/t7502-commit.sh
@@ -204,7 +204,7 @@ test_expect_success 'cleanup commit messages (verbatim option,-F)' '
'
-test_expect_failure 'cleanup commit messages (verbatim option,-m)' '
+test_expect_success 'cleanup commit messages (verbatim option,-m)' '
echo >>negative &&
git commit --cleanup=verbatim -m "$mesg_with_comment_and_newlines" -a &&