From: Jeff King <peff@peff.net>
To: Paul Tan <pyokagan@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, Git List <git@vger.kernel.org>
Subject: Re: [BUG?] retrying with "am -3" doesn't work anymore
Date: Wed, 30 Mar 2016 01:06:42 -0400 [thread overview]
Message-ID: <20160330050642.GB11007@sigill.intra.peff.net> (raw)
In-Reply-To: <CACRoPnSrKyNS8EdFM119TT9qoUTdNy_+P5q-7rWMahpDzzGAKw@mail.gmail.com>
On Wed, Mar 30, 2016 at 12:18:30PM +0800, Paul Tan wrote:
> On Wed, Mar 30, 2016 at 10:15 AM, Jeff King <peff@peff.net> wrote:
> > I noticed that I could not get a patch from Junio to apply earlier
> > today, and I think it is a regression in the builtin git-am
> > implementation. I had trouble reproducing with a basic test case,
> > though.
> >
> > Basically, I picked up the three patches from this sub-thread:
> >
> > http://thread.gmane.org/gmane.comp.version-control.git/288987/focus=290222
> >
> > and tried to apply them on top of v2.8.0.
> >
> > Doing it with "git am -3 patches" works. But doing it with:
> >
> > git am patches
> > git am -3
> >
> > doesn't. Bisecting shows that it did work before 783d7e8 (builtin-am:
> > remove redirection to git-am.sh, 2015-08-04).
>
> Yeah, with "git am -3" when resuming, the -3 will only affect the
> current conflicting patch since 852a171 (am: let command-line options
> override saved options, 2015-08-04).
Ah, right. I had a nagging feeling that we had discussed this, and
indeed, I already participated in the discussion last July[1]. I even
apparently argued in favor of the new behavior[2]. Yikes. There goes my
mind.
Running "git am -3" for each patch which needs it does indeed
successfully apply the series.
Thanks for a quick response, and sorry for the noise.
-Peff
[1] http://thread.gmane.org/gmane.comp.version-control.git/274574
[2] In http://thread.gmane.org/gmane.comp.version-control.git/274574/focus=274635,
though I think there I more meant that in:
git am
git am -3
git am
the third one would not use "-3" again. So I was mostly confused
that in:
git am
git am -3
we would not use "-3" for the subsequent patches applied by that
second invocation. So maybe that is a bug. I dunno. I could see
arguments either way.
prev parent reply other threads:[~2016-03-30 5:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-30 2:15 [BUG?] retrying with "am -3" doesn't work anymore Jeff King
2016-03-30 4:18 ` Paul Tan
2016-03-30 5:06 ` Jeff King [this message]
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=20160330050642.GB11007@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pyokagan@gmail.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).