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

Re: [PATCH] diff: allow --color-moved with --no-ext-diff

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 25, 2024, 00:39 UTC
Message-ID
<xmqqmsn9am9p.fsf@gitster.g>
In-Reply-To
<48948980-ac98-452a-b2df-11cd81de56da@web.de>
René Scharfe <l.s.r@web.de> writes:
Show 8 quoted lines
>> If we did this instead
>>
>> 	git diff --color --color-moved=zebra --no-renames HEAD >expect &&
>>
>> it would make this a lot more self-contained.
>
> Oh, yes, good idea!  We'd still rely on there being staged differences
> that include moved lines,

Yeah, the primary point of this fix is that the output with "--no-ext-diff" and configured external diff driver, and without either, should be the same. And running the same command twice, once with and once without these two tweaks, and comparing their results is exactly what we want to do.

Previous: René ScharfeNext: René Scharfe
Message 7 of 9 in “Bug: diff.external --no-ext-diff suppresses --color-moved”
  1. lolligerhans@gmx.deJun 22, 2024
  2. diff: allow --color-moved with --no-ext-diffRené Scharfe, Jun 22, 2024
  3. Aw: [PATCH] diff: allow --color-moved with --no-ext-difflolligerhans@gmx.de, Jun 23, 2024
  4. René ScharfeJun 23, 2024
  5. Junio C HamanoJun 24, 2024
  6. René ScharfeJun 24, 2024
  7. Junio C HamanoJun 25, 2024
  8. diff: allow --color-moved with --no-ext-diffRené Scharfe, Jun 24, 2024
  9. Junio C HamanoJun 24, 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.