Re: Better suggestions when git-am(1) fails

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 9, 2023, 21:53 UTC
Message-ID: <xmqqr0tx8ubw.fsf@gitster.g>
In-Reply-To: <ZAl3bHB9zxjLITgf@coredump.intra.peff.net>

Jeff King <peff@peff.net> writes:

Show 12 quoted lines

> 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.