From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Alejandro Colomar <alx.manpages@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: Better suggestions when git-am(1) fails
Date: Thu, 09 Mar 2023 13:53:55 -0800 [thread overview]
Message-ID: <xmqqr0tx8ubw.fsf@gitster.g> (raw)
In-Reply-To: <ZAl3bHB9zxjLITgf@coredump.intra.peff.net> (Jeff King's message of "Thu, 9 Mar 2023 01:06:36 -0500")
Jeff King <peff@peff.net> writes:
> So here's a patch series which I think should help with the sending
> side. Most of it is just filling in gaps in the code and tests for
> current features. Patch 4 is the actual change. Patch 5 adds an
> equivalent option just for format-patch. I'm not convinced anybody
> really wants it (which is why I split it out), but it's probably worth
> doing just in case.
>
> [1/5]: diff: factor out src/dst prefix setup
> [2/5]: t4013: add tests for diff prefix options
> [3/5]: diff: add --default-prefix option
> [4/5]: format-patch: do not respect diff.noprefix
> [5/5]: format-patch: add format.noprefix option
I've reviewed these five changes, and while I am not 100% sold to
the idea that we should force our -p1 worldview to those who choose
to use diff.noprefix for whatever reason, I think these patches
describe what they want to do and implement it in a very readable
way.
Thanks. Queued.
next prev parent reply other threads:[~2023-03-09 21:54 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-08 20:15 Better suggestions when git-am(1) fails Alejandro Colomar
2023-03-09 3:17 ` Jeff King
2023-03-09 6:06 ` Jeff King
2023-03-09 6:07 ` [PATCH 1/5] diff: factor out src/dst prefix setup Jeff King
2023-03-09 10:50 ` Alejandro Colomar
2023-03-09 6:07 ` [PATCH 2/5] t4013: add tests for diff prefix options Jeff King
2023-03-09 6:09 ` [PATCH 3/5] diff: add --default-prefix option Jeff King
2023-03-09 10:51 ` Alejandro Colomar
2023-03-09 16:31 ` Junio C Hamano
2023-03-10 9:44 ` Jeff King
2023-03-10 17:04 ` Junio C Hamano
2023-03-13 16:43 ` Jeff King
2023-03-13 17:17 ` Junio C Hamano
2023-03-13 17:31 ` Junio C Hamano
2023-03-13 19:54 ` Jeff King
2023-03-09 6:11 ` [PATCH 4/5] format-patch: do not respect diff.noprefix Jeff King
2023-03-09 10:53 ` Alejandro Colomar
2023-03-09 16:41 ` Junio C Hamano
2023-03-10 9:49 ` Jeff King
2023-03-09 6:12 ` [PATCH 5/5] format-patch: add format.noprefix option Jeff King
2023-03-09 17:00 ` Junio C Hamano
2023-03-10 9:51 ` Jeff King
2023-03-09 10:58 ` Better suggestions when git-am(1) fails Alejandro Colomar
2023-03-09 21:53 ` Junio C Hamano [this message]
2023-03-10 9:54 ` Jeff King
2023-03-09 16:22 ` Junio C Hamano
2023-03-10 9:39 ` Jeff King
2023-03-10 16:28 ` Junio C Hamano
2023-03-13 16:37 ` Jeff King
2023-03-13 17:10 ` 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=xmqqr0tx8ubw.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=alx.manpages@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).