From: Junio C Hamano <gitster@pobox.com>
To: "René Scharfe" <l.s.r@web.de>
Cc: lolligerhans@gmx.de, git@vger.kernel.org
Subject: Re: [PATCH] diff: allow --color-moved with --no-ext-diff
Date: Mon, 24 Jun 2024 17:39:30 -0700 [thread overview]
Message-ID: <xmqqmsn9am9p.fsf@gitster.g> (raw)
In-Reply-To: <48948980-ac98-452a-b2df-11cd81de56da@web.de> ("René Scharfe"'s message of "Mon, 24 Jun 2024 21:15:43 +0200")
René Scharfe <l.s.r@web.de> writes:
>> 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.
next prev parent reply other threads:[~2024-06-25 0:39 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-22 10:01 Bug: diff.external --no-ext-diff suppresses --color-moved lolligerhans
2024-06-22 19:41 ` [PATCH] diff: allow --color-moved with --no-ext-diff René Scharfe
2024-06-23 9:17 ` Aw: " lolligerhans
2024-06-23 9:46 ` René Scharfe
2024-06-24 16:21 ` Junio C Hamano
2024-06-24 19:15 ` René Scharfe
2024-06-25 0:39 ` Junio C Hamano [this message]
2024-06-24 19:15 ` [PATCH v2] " René Scharfe
2024-06-24 20:53 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqmsn9am9p.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=l.s.r@web.de \
--cc=lolligerhans@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).