From: Jeff King <peff@peff.net>
To: Thomas Rast <trast@student.ethz.ch>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH] commit: allow {--amend|-c foo} when {HEAD|foo} has empty message
Date: Tue, 28 Feb 2012 04:05:40 -0500 [thread overview]
Message-ID: <20120228090540.GB5757@sigill.intra.peff.net> (raw)
In-Reply-To: <8529824c8569a8a0b4c4caf3a562750925758e74.1330419275.git.trast@student.ethz.ch>
On Tue, Feb 28, 2012 at 09:57:05AM +0100, Thomas Rast wrote:
> diff --git a/builtin/commit.c b/builtin/commit.c
> index 3714582..45a57af 100644
> --- a/builtin/commit.c
> +++ b/builtin/commit.c
> @@ -690,7 +690,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
> hook_arg1 = "message";
> } else if (use_message) {
> buffer = strstr(use_message_buffer, "\n\n");
> - if (!buffer || buffer[2] == '\0')
> + if (!amend && !edit_message && (!buffer || buffer[2] == '\0'))
> die(_("commit has empty message"));
Hmm. So "buffer" used to never be NULL (because we would die if it is),
and now we might not die if we are doing an amend, no? And the next line
is:
> strbuf_add(&sb, buffer + 2, strlen(buffer + 2));
Doesn't this need to handle the case of NULL buffer (i.e., when it does
not already have "\n\n" in it)?
-Peff
next prev parent reply other threads:[~2012-02-28 9:05 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-28 8:57 [PATCH] commit: allow {--amend|-c foo} when {HEAD|foo} has empty message Thomas Rast
2012-02-28 9:05 ` Jeff King [this message]
2012-02-28 9:14 ` Jeff King
2012-02-28 9:20 ` Thomas Rast
2012-02-28 17:21 ` Junio C Hamano
2012-02-28 19:59 ` Jeff King
2012-02-28 21:12 ` Junio C Hamano
2012-02-28 10:36 ` [PATCH v2] " Thomas Rast
2012-02-28 10:37 ` [RFC PATCH 2a] pretty: detect missing \n\n in commit message Thomas Rast
2012-02-28 12:56 ` Nguyen Thai Ngoc Duy
2012-02-28 17:27 ` Junio C Hamano
2012-02-28 10:37 ` [RFC PATCH 2b] parse_commit: refuse to load commit without \n\n separator Thomas Rast
2012-02-28 17:25 ` [PATCH v2] commit: allow {--amend|-c foo} when {HEAD|foo} has empty message Junio C Hamano
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=20120228090540.GB5757@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=trast@student.ethz.ch \
/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).