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
Stefan Beller <sbeller@google.com>
Date
Dec 2, 2015, 01:10 UTC
Message-ID
<CAGZ79kZ8WLzwvsSPCgt4ncfqib479mXuDWQ5cLj0QjmZmR439g@mail.gmail.com>
In-Reply-To
<20151202005826.GE28197@sigill.intra.peff.net>
On Tue, Dec 1, 2015 at 4:58 PM, Jeff King <peff@peff.net> wrote:
Show 15 quoted lines
> On Wed, Nov 25, 2015 at 04:59:35PM +0100, huebbe wrote:
>
>> 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.
Do we as the Git community have a place where we take notes for version 3?

This sounds perfectly fine (to me at least) to change the default with a major version number as the changelog for major version numbers may even be read by kernel devs maintaining such scripts ;)

Or could we even patch that today to have `--keep-non-patch` be default later on by checking for our version number ourselves and deciding upon that for the default?

Show 6 quoted lines
>
> -Peff
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous: Jeff KingNext: Junio C Hamano
Message 5 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.