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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html