aboutsummaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2016-06-29 16:14:42 +0200
committerJunio C Hamano <gitster@pobox.com>2016-06-29 14:56:37 -0700
commit84e213a30a1d4a3835e23b2f3d6217eb74ea55f7 (patch)
treec0294371210ad9c52f66c001be0b1e9a28e536a2 /builtin
parent4e1b06da252a7609f0c6641750e6acbec451e698 (diff)
downloadgit-84e213a30a1d4a3835e23b2f3d6217eb74ea55f7.tar.gz
git-84e213a30a1d4a3835e23b2f3d6217eb74ea55f7.tar.xz
commit -C: skip blank lines at the beginning of the message
Consistent with the pretty-printing machinery, we skip leading blank lines (if any) of existing commit messages. While Git itself only produces commit objects with a single empty line between commit header and commit message, it is legal to have more than one blank line (i.e. lines containing only white space, or no characters) at the beginning of the commit message, and the pretty-printing code already handles that. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/commit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index c2ebea4ed..b0effbb92 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -712,7 +712,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
char *buffer;
buffer = strstr(use_message_buffer, "\n\n");
if (buffer)
- strbuf_addstr(&sb, buffer + 2);
+ strbuf_addstr(&sb, skip_blank_lines(buffer + 2));
hook_arg1 = "commit";
hook_arg2 = use_message;
} else if (fixup_message) {