From: Jeff King <peff@peff.net>
Date: Wed, 02 Dec 2015 00:58:27 GMT
Subject: Re: Bug: Incorrect stripping of the [PATCH] prefix in git-am
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:

> 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