@matheusbsbs / matheus-bagliano / commits / a24a41ea9a

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>

Brandon Casey committed Feb 18, 2013 at 20:17 UTC a24a41ea9a928ccde2db074ab0835c4817223c9d

2 files changed +4 -2

builtin/commit.c

+3 -1

@@ -124,8 +124,10 @@ static int opt_parse_m(const struct option *opt, const char *arg, int unset)

124 if (unset)

125 strbuf_setlen(buf, 0);

126 else {

127 + if (buf->len)

128 + strbuf_addch(buf, '\n');

129 strbuf_addstr(buf, arg);

128 - strbuf_addstr(buf, "\n\n");

130 + strbuf_complete_line(buf);

131 }

132 return 0;

133 }

t/t7502-commit.sh

+1 -1

@@ -204,7 +204,7 @@ test_expect_success 'cleanup commit messages (verbatim option,-F)' '

204

205 '

206

207 -test_expect_failure 'cleanup commit messages (verbatim option,-m)' '

207 +test_expect_success 'cleanup commit messages (verbatim option,-m)' '

208

209 echo >>negative &&

210 git commit --cleanup=verbatim -m "$mesg_with_comment_and_newlines" -a &&