From: Jeff King <peff@peff.net>
To: Paul Tan <pyokagan@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: [BUG?] retrying with "am -3" doesn't work anymore
Date: Tue, 29 Mar 2016 22:15:02 -0400 [thread overview]
Message-ID: <20160330021502.GA16077@sigill.intra.peff.net> (raw)
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).
I tried to tweak t4150 to show this by replacing a "git am -3 foo" with
"test_must_fail git am foo && git am -3", but it failed even on older
git, which made me think I fumbled the test somehow.
-Peff
next reply other threads:[~2016-03-30 2:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-30 2:15 Jeff King [this message]
2016-03-30 4:18 ` [BUG?] retrying with "am -3" doesn't work anymore Paul Tan
2016-03-30 5:06 ` Jeff King
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=20160330021502.GA16077@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).