From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 0/2] "am -3" and "--no-prefix" does not work well
Date: Tue, 28 Feb 2012 15:24:53 -0800 [thread overview]
Message-ID: <1330471495-12013-1-git-send-email-gitster@pobox.com> (raw)
I wrote these a few days ago when I tried to review somebody's patch
on this list that was made with "format-patch --no-prefix". The regular
patch application without the three-way fallback was prepared to honor a
custom -p<num>, but the code to synthesize the fake ancestor tree forgot
to pay attention to -p<num>, so "am -3 -p0" was failing.
Junio C Hamano (2):
am -3: allow nonstandard -p<num> option
test: "am -3" can accept non-standard -p<num>
git-am.sh | 11 +++++++----
t/t4150-am.sh | 15 +++++++++++++++
2 files changed, 22 insertions(+), 4 deletions(-)
--
1.7.9.2.344.g3e8c86
next reply other threads:[~2012-02-28 23:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-28 23:24 Junio C Hamano [this message]
2012-02-28 23:24 ` [PATCH 1/2] am -3: allow nonstandard -p<num> option Junio C Hamano
2012-02-29 2:58 ` Jeff King
2012-02-29 3:36 ` Junio C Hamano
2012-02-29 7:27 ` Jeff King
2012-02-28 23:24 ` [PATCH 2/2] test: "am -3" can accept non-standard -p<num> Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1330471495-12013-1-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/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.
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 NNTP newsgroup(s).