From 8b1ae678a33e2d1ccf3080977b692a59acad9b50 Mon Sep 17 00:00:00 2001 From: Boris Faure Date: Sun, 8 May 2011 12:31:02 +0200 Subject: Do not strip empty lines / trailing spaces from a commit message template Templates should be just that: A form that the user fills out, and forms have blanks. If people are attached to not having extra whitespace in the editor, they can simply clean up their templates. Added test with editor adding even more whitespace. Signed-off-by: Boris Faure Based-on-patch-by:Sebastian Schuberth Signed-off-by: Junio C Hamano --- builtin/commit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'builtin/commit.c') diff --git a/builtin/commit.c b/builtin/commit.c index 67757e999..411d5e415 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -615,6 +615,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix, const char *hook_arg1 = NULL; const char *hook_arg2 = NULL; int ident_shown = 0; + int clean_message_contents = (cleanup_mode != CLEANUP_NONE); if (!no_verify && run_hook(index_file, "pre-commit", NULL)) return 0; @@ -681,6 +682,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix, if (strbuf_read_file(&sb, template_file, 0) < 0) die_errno(_("could not read '%s'"), template_file); hook_arg1 = "template"; + clean_message_contents = 0; } /* @@ -708,7 +710,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix, if (s->fp == NULL) die_errno(_("could not open '%s'"), git_path(commit_editmsg)); - if (cleanup_mode != CLEANUP_NONE) + if (clean_message_contents) stripspace(&sb, 0); if (signoff) { -- cgit v1.2.1