From: Stefan Beller <sbeller@google.com>
To: Jeff King <peff@peff.net>
Cc: huebbe <nathanael.huebbe@informatik.uni-hamburg.de>,
stefan.naewe@atlas-elektronik.com,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Bug: Incorrect stripping of the [PATCH] prefix in git-am
Date: Tue, 1 Dec 2015 17:10:12 -0800 [thread overview]
Message-ID: <CAGZ79kZ8WLzwvsSPCgt4ncfqib479mXuDWQ5cLj0QjmZmR439g@mail.gmail.com> (raw)
In-Reply-To: <20151202005826.GE28197@sigill.intra.peff.net>
On Tue, Dec 1, 2015 at 4:58 PM, Jeff King <peff@peff.net> wrote:
> 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?
>
> -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
next prev parent reply other threads:[~2015-12-02 1:10 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-25 15:29 Bug: Incorrect stripping of the [PATCH] prefix in git-am huebbe
2015-11-25 15:44 ` stefan.naewe
2015-11-25 15:59 ` huebbe
2015-12-02 0:58 ` Jeff King
2015-12-02 1:10 ` Stefan Beller [this message]
2015-12-02 2:27 ` Junio C Hamano
2015-12-02 2:24 ` Junio C Hamano
2015-12-02 12:38 ` huebbe
2015-12-02 15:49 ` Jeff King
2015-12-03 10:32 ` huebbe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAGZ79kZ8WLzwvsSPCgt4ncfqib479mXuDWQ5cLj0QjmZmR439g@mail.gmail.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=nathanael.huebbe@informatik.uni-hamburg.de \
--cc=peff@peff.net \
--cc=stefan.naewe@atlas-elektronik.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).