git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v3] diff: add diff.srcPrefix and diff.dstPrefix configuration variables

From
DSDragan Simic <dsimic@manjaro.org>
Date
Mar 13, 2024, 20:23 UTC
Message-ID
<dc87a2c7e596b1bdca6c1c16b11d74c9@manjaro.org>
In-Reply-To
<xmqqbk7if8vj.fsf@gitster.g>
On 2024-03-13 16:29, Junio C Hamano wrote:
Show 19 quoted lines
>  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`.
How about this instead:
     Ignore any configuration variables that control source and
     destination prefixes, which includes `diff.noPrefix`, 
`diff.srcPrefix`
     and `diff.dstPrefix` (see `git-config`(1)), and use the default
     prefixes `a/` and `b/`.
>  --line-prefix=<prefix>::
>  	Prepend an additional prefix to every line of output.
Previous: Peter HuttererNext: Peter Hutterer
Message 18 of 28 in “diff: add diff.srcprefix and diff.dstprefix option support”
  1. diff: add diff.srcprefix and diff.dstprefix option supportPeter Hutterer, Mar 11, 2024
  2. Junio C HamanoMar 11, 2024
  3. diff: add diff.srcprefix and diff.dstprefix configuration variablesPeter Hutterer, Mar 12, 2024
  4. Junio C HamanoMar 12, 2024
  5. Dragan SimicMar 12, 2024
  6. diff: add diff.srcPrefix and diff.dstPrefix configuration variablesPeter Hutterer, Mar 12, 2024
  7. Dragan SimicMar 13, 2024
  8. Dragan SimicMar 13, 2024
  9. Phillip WoodMar 13, 2024
  10. Dragan SimicMar 13, 2024
  11. Junio C HamanoMar 13, 2024
  12. Dragan SimicMar 13, 2024
  13. Phillip WoodMar 13, 2024
  14. Junio C HamanoMar 13, 2024
  15. Phillip WoodMar 13, 2024
  16. Junio C HamanoMar 13, 2024
  17. Peter HuttererMar 14, 2024
  18. Dragan SimicMar 13, 2024
  19. diff: add diff.srcPrefix and diff.dstPrefix configuration variablesPeter Hutterer, Mar 15, 2024
  20. Dragan SimicMar 15, 2024
  21. diff: add diff.srcPrefix and diff.dstPrefix configuration variablesPeter Hutterer, Mar 15, 2024
  22. Dragan SimicMar 15, 2024
  23. Junio C HamanoMar 15, 2024
  24. Dragan SimicMar 15, 2024
  25. Junio C HamanoMar 16, 2024
  26. Dragan SimicMar 16, 2024
  27. Peter HuttererMar 18, 2024
  28. Junio C HamanoMar 18, 2024

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.