Merge branch 'js/ignore-space-at-eol' into maint

diff --git a/builtin/commit.c b/builtin/commit.c
index 163dbcabf3ba25a6e0e7f387624cee9a2edbb149..37702f356123cbf91342d6c206a126c020713873 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -714,7 +714,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) {