git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] commit: --amend -m '' silently fails to wipe message

From
Jeff King <peff@peff.net>
Date
Apr 7, 2016, 19:02 UTC
Message-ID
<20160407190210.GA4478@sigill.intra.peff.net>
In-Reply-To
<xmqqshyxz3ss.fsf@gitster.mtv.corp.google.com>
On Thu, Apr 07, 2016 at 11:12:19AM -0700, Junio C Hamano wrote:
Show 26 quoted lines
> Jeff King <peff@peff.net> writes:
> 
> > I guessed that this might have come from the conversion of "message"
> > form a pointer (which could be NULL) into a strbuf. And indeed, it looks
> > like f956853 (builtin-commit: resurrect behavior for multiple -m
> > options, 2007-11-11) did that.
> 
> Yikes.  That is a quite ancient breakage.
> 
> The funny thing is that we did address the same breakage in 25206778
> (commit: don't start editor if empty message is given with -m,
> 2013-05-25), but didn't notice that there are other breakages of the
> same nature.
> 
> I think all message.len check can and should be have_option_m
> instead.
> 
>  - The one in the first hunk is a fix for the issue that "-m ''" is
>    ignored and we read from use_message etc., which is the original
>    issue in this thread.
> 
>  - The second one is a fix for your "git commit -m '' -F f" example
>    that does not error out.
> 
>  - The last one is a fix for "git -c commit.template=f commit -m ''"
>    that still uses the template file 'f'.

Yes, FWIW, those were the sites and reasons I identified last night. Your patch looks like the right thing to me.

-Peff
Previous: Junio C HamanoNext: Junio C Hamano
Message 5 of 9 in “commit: --amend -m '' silently fails to wipe message”
  1. commit: --amend -m '' silently fails to wipe messageAdam Dinwoodie, Apr 6, 2016
  2. Jeff KingApr 7, 2016
  3. Jeff KingApr 7, 2016
  4. Junio C HamanoApr 7, 2016
  5. Jeff KingApr 7, 2016
  6. Junio C HamanoApr 7, 2016
  7. Jeff KingApr 7, 2016
  8. Adam DinwoodieApr 7, 2016
  9. Jeff KingApr 7, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.