Re: [PATCH] format-patch: generate valid patch with diff.noprefix config

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 2, 2020, 22:09 UTC
Message-ID: <xmqqeeqxrufz.fsf@gitster.c.googlers.com>
In-Reply-To: <xmqqpnahrx2y.fsf@gitster.c.googlers.com>

Junio C Hamano <gitster@pobox.com> writes:

Show 13 quoted lines

> Laurent Arnoud <laurent@spkdev.net> writes:
>
>> With diff.noprefix enabled the patch generated with format-patch does not
>> include prefix a/ and b/ so not applicable with `git am`.
>
> Some projects (not this one) do not want to see a/ and b/ prefix in
> their patches, and noprefix is an option for those who needs to give
> patches to such projects.  As "am" can be told with -p<num> to accept
> such a patch just fine, I do not think this change is appropriate.
>
>> Solution is to force a_prefix and b_prefix on diffopt.
>
> Sorry, I do not think there is any problem to be solved here ;-)

Having said all that, we seem to be letting more configurations for the diff.* family to affect the format-patch command. The latest addition was "diff.relative"---together with the "diff.noprefix" that triggered this thread, some users may feel that it is a bug to allow these configuration variables to affect the output from the "log -p", "show", and "format-patch" commands.

It *might* make sense to introduce log.diff.* configuration variables so that when they are set, they are used by log/show/format-patch instead of diff.* counterparts, or something along those lines. I dunno.