Re: [PATCH v3] diff: add diff.srcPrefix and diff.dstPrefix configuration variables
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 13, 2024, 15:29 UTC
- Message-ID
- <xmqqbk7if8vj.fsf@gitster.g>
- In-Reply-To
- <f8565251-2af1-470b-9b2d-798e3504b0d1@gmail.com>
Phillip Wood <phillip.wood123@gmail.com> writes:
Show 8 quoted lines
>> With a custom prefix those scripts will break, having an option that
>> forces the a/ and b/ prefix helps. Plus the man page explicitly says:
>> Use the default source and destination prefixes ("a/" and "b/").
>> So let's stick with that behaviour then.
>
> As I understand it the purpose of --default-prefix is to override all
> the prefix related config settings so this seems like a very sensible
> choice.It would be nice to update the description of '--default-prefix' so that nobody has to say "As I understand it" anymore ;-)
As we are selling .{src,dst}Prefix as a thing that sets the default prefix, we'd need to break the loop somehow, and "hardcoded" below is my attempt to do so, but I am not sure if I succeeded.
Documentation/diff-options.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git c/Documentation/diff-options.txt w/Documentation/diff-options.txt index aaaff0d46f..62eaa46d84 100644 --- c/Documentation/diff-options.txt +++ w/Documentation/diff-options.txt @@ -864,9 +864,10 @@ endif::git-format-patch[] Do not show any source or destination prefix. --default-prefix:: - Use the default source and destination prefixes ("a/" and "b/"). - This is usually the default already, but may be used to override - config such as `diff.noprefix`. + Use the hardcoded default source and destination prefixes + ("a/" and "b/"). This is designed to be used to override + configuration variables such as `diff.noprefix` and + `diff.srcPrefix`. --line-prefix=<prefix>:: Prepend an additional prefix to every line of output.