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

Re: Bug: Incorrect stripping of the [PATCH] prefix in git-am

From
Jeff King <peff@peff.net>
Date
Dec 2, 2015, 00:58 UTC
Message-ID
<20151202005826.GE28197@sigill.intra.peff.net>
In-Reply-To
<5655DAE7.2000008@informatik.uni-hamburg.de>
On Wed, Nov 25, 2015 at 04:59:35PM +0100, huebbe wrote:
Show 5 quoted lines
> Yes, it looks like the `--keep-non-patch` option works around this.
> 
> However, shouldn't that be the default behaviour?
> I mean, what is the point in stripping stuff that is not proven to be inserted by `git` itself?
> That's not what I expect a tool to do which I trust.

The "[]" convention is a microformat used by Linux kernel folks. So it's not "whoops, we are stripping stuff not added by git". It is respecting a microformat used by the tool's authors.

That being said, if we were choosing a default from scratch today, it might go the other way. But we aren't, and we have to deal with the burden of breaking existing scripts by flipping it.

-Peff
Previous: huebbeNext: Stefan Beller
Message 4 of 10 in “Bug: Incorrect stripping of the [PATCH] prefix in git-am”
  1. huebbeNov 25, 2015
  2. stefan.naewe@atlas-elektronik.comNov 25, 2015
  3. huebbeNov 25, 2015
  4. Jeff KingDec 2, 2015
  5. Stefan BellerDec 2, 2015
  6. Junio C HamanoDec 2, 2015
  7. Junio C HamanoDec 2, 2015
  8. huebbeDec 2, 2015
  9. Jeff KingDec 2, 2015
  10. huebbeDec 3, 2015

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.