From: Boris Faure <billiob@gmail.com>
To: git@vger.kernel.org
Cc: Boris Faure <billiob@gmail.com>
Subject: [PATCH 2/2] commit: do not add a newline after a template
Date: Sat, 7 May 2011 17:53:44 +0200 [thread overview]
Message-ID: <1304783624-9919-2-git-send-email-billiob@gmail.com> (raw)
In-Reply-To: <1304783624-9919-1-git-send-email-billiob@gmail.com>
Signed-off-by: Boris Faure <billiob@gmail.com>
---
builtin/commit.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index f0e880b..2209924 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -754,7 +754,8 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
? "MERGE_HEAD"
: "CHERRY_PICK_HEAD"));
- fprintf(s->fp, "\n");
+ if (!template_file)
+ fprintf(s->fp, "\n");
status_printf(s, GIT_COLOR_NORMAL,
_("Please enter the commit message for your changes."));
if (cleanup_mode == CLEANUP_ALL)
--
1.7.5.1
next prev parent reply other threads:[~2011-05-07 15:54 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-07 15:53 [PATCH 1/2] commit: do not cleanup template Boris Faure
2011-05-07 15:53 ` Boris Faure [this message]
2011-05-07 20:13 ` Junio C Hamano
2011-05-07 21:17 ` Boris 'billiob' Faure
2011-05-07 22:31 ` Junio C Hamano
2011-05-08 8:38 ` Sebastian Schuberth
2011-05-08 8:47 ` Sebastian Schuberth
2011-05-08 10:31 ` [PATCH/RFC v2] Do not strip empty lines / trailing spaces from a commit message template Boris Faure
2011-05-08 12:28 ` Sebastian Schuberth
2011-05-08 18:14 ` Junio C Hamano
2011-05-08 18:55 ` [PATCH/RFC v3] " Boris Faure
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1304783624-9919-2-git-send-email-billiob@gmail.com \
--to=billiob@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).