From: phillip.wood123@gmail.com
To: "René Scharfe" <l.s.r@web.de>,
phillip.wood@dunelm.org.uk,
"German Lashevich" <german.lashevich@gmail.com>,
git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 2/2] diff: fix --exit-code with external diff
Date: Wed, 8 May 2024 16:25:47 +0100 [thread overview]
Message-ID: <539926ac-4274-4b4b-a2ee-aa48af791124@gmail.com> (raw)
In-Reply-To: <4bf12c41-a6ea-4939-ba76-e2c784952eaa@web.de>
Hi René
On 06/05/2024 19:23, René Scharfe wrote:
> Am 05.05.24 um 17:25 schrieb Phillip Wood:
>> Merge strategies are expected to exit 0 on success, 1 when there are
>> conflicts and another non-zero value for other errors - it would be
>> nice to do something similar here where 1 means "there were
>> differences" but it is probably too late to do that without a config
>> value to indicate that we should trust the exit code.
> Right, such a diff command protocol v2 would not need to pipe the
> output through an inspection loop. Sounds like a good idea. It's
> unfortunate that it would increase the configuration surface, which is
> not in an acute need to expand. We could advertise the new option when
> dying due to the unsupported combination of --exit-code and external
> diff, but that's in equal parts helpful and obnoxious, I feel.
Yes, diff dying would be annoying but the message would be useful.
Thinking about the external diff and some of the other diff options I
wonder what we should do when options like "--quiet" and "--name-only"
are combined with an external diff (I haven't checked the current
behavior). If we introduced a diff command protocol v2 we could include
a way to pass through "--quiet" though maybe just redirecting the stdout
of the external command to /dev/null and using the exit code would be
sufficient.
Best Wishes
Phillip
P.S. I haven't forgotten about our unit-test discussion but I'm afraid
it will probably be the middle of next month before I have time to reply.
next prev parent reply other threads:[~2024-05-08 15:26 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-20 1:13 Possible git-diff bug when using exit-code with diff filters German Lashevich
2024-04-21 10:42 ` René Scharfe
2024-04-21 18:17 ` Junio C Hamano
2024-04-21 18:32 ` rsbecker
2024-04-21 19:09 ` Junio C Hamano
2024-04-21 20:18 ` rsbecker
2024-05-05 10:19 ` René Scharfe
2024-05-06 17:22 ` Junio C Hamano
2024-05-05 10:19 ` [PATCH 1/2] diff: report unmerged paths as changes in run_diff_cmd() René Scharfe
2024-05-05 10:20 ` [PATCH 2/2] diff: fix --exit-code with external diff René Scharfe
2024-05-05 15:25 ` Phillip Wood
2024-05-06 17:31 ` Junio C Hamano
2024-05-06 18:23 ` René Scharfe
2024-05-08 15:25 ` phillip.wood123 [this message]
2024-05-11 20:32 ` René Scharfe
2024-05-12 9:38 ` René Scharfe
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=539926ac-4274-4b4b-a2ee-aa48af791124@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=german.lashevich@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
--cc=phillip.wood@dunelm.org.uk \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).