From: Junio C Hamano <gitster@pobox•com>
To: "René Scharfe" <l.s.r@web•de>
Cc: Johannes Sixt <j6t@kdbg•org>,
German Lashevich <german.lashevich@gmail•com>,
Phillip Wood <phillip.wood@dunelm•org.uk>,
git@vger•kernel.org
Subject: Re: [PATCH v2 3/3] diff: let external diffs report that changes are uninteresting
Date: Thu, 06 Jun 2024 08:49:00 -0700 [thread overview]
Message-ID: <xmqqsexqnkb7.fsf@gitster.g> (raw)
In-Reply-To: <55389f35-5762-4b86-81bf-b9fe956815d2@web.de> ("René Scharfe"'s message of "Thu, 6 Jun 2024 10:28:24 +0200")
René Scharfe <l.s.r@web•de> writes:
>>> +diff.trustExitCode::
>>> + If this boolean value is set to true then the `diff.external`
>>> + command is expected to return exit code 1 if it finds
>>> + significant changes and 0 if it doesn't, like diff(1). If it's
>>> + false then the `diff.external` command is expected to always
>>> + return exit code 0. Defaults to false.
>>
>> I find this somewhat unclear. What are the consequences when this value
>> is set to false, but the command exits with code other than 0? Is it
>>
>> If it's false then any exit code other than 0 of the `diff.external`
>> command is treated as an error.
>
> Yes, unexpected exit codes are reported as errors.
>
> If trustExitCode is false and --quiet is given then the execution of
> external diffs is skipped, so in that situation there is no exit code to
> expect, though. Not sure how to express it concisely, though. This
> attempt looks a bit bloated:
>
> --quiet::
> Disable all output of the program. Implies `--exit-code`.
> Disables execution of external diff helpers whose exit code
> is not trusted, i.e. their respective configuration option
> `diff.trustExitCode` or `diff.<driver>.trustExitCode` or
> environment variable `GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE` is
> false.
>
> Might be worth documenting this original behavior somehow, anyway. It
> makes sense in hindsight, but surprised me a bit when I wrote the tests.
Yes. The explanation of trustExitCode makes sense as an explanation
of what the variable means (i.e. if set, we pay attention to the
exit code of the external diff driver, otherwise a non-zero exit is
an error), but I suspect that readers are _more_ interested in how
the external diff driver contributes to the answer to the "has this
path been changed?" question when the variable is on and off. And
the above description of "--quiet" does help answer that question
somewhat.
next prev parent reply other threads:[~2024-06-06 15:49 UTC|newest]
Thread overview: 32+ 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
2024-05-11 20:32 ` René Scharfe
2024-05-12 9:38 ` René Scharfe
2024-06-05 8:31 ` [PATCH v2 0/3] " René Scharfe
2024-06-05 8:35 ` [PATCH v2 1/3] t4020: test exit code with external diffs René Scharfe
2024-06-05 8:36 ` [PATCH v2 2/3] userdiff: add and use struct external_diff René Scharfe
2024-06-05 8:38 ` [PATCH v2 3/3] diff: let external diffs report that changes are uninteresting René Scharfe
2024-06-06 6:39 ` Johannes Sixt
2024-06-06 8:28 ` René Scharfe
2024-06-06 15:49 ` Junio C Hamano [this message]
2024-06-06 9:48 ` Phillip Wood
2024-06-07 8:19 ` René Scharfe
2024-06-05 16:47 ` [PATCH v2 0/3] diff: fix --exit-code with external diff Junio C Hamano
2024-06-09 7:35 ` [PATCH v3 " René Scharfe
2024-06-09 7:38 ` [PATCH v3 1/3] t4020: test exit code with external diffs René Scharfe
2024-06-10 16:33 ` Junio C Hamano
2024-06-09 7:39 ` [PATCH v3 2/3] userdiff: add and use struct external_diff René Scharfe
2024-06-09 7:41 ` [PATCH v3 3/3] diff: let external diffs report that changes are uninteresting René Scharfe
2024-06-10 13:48 ` [PATCH v3 0/3] diff: fix --exit-code with external diff phillip.wood123
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=xmqqsexqnkb7.fsf@gitster.g \
--to=gitster@pobox$(echo .)com \
--cc=german.lashevich@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=j6t@kdbg$(echo .)org \
--cc=l.s.r@web$(echo .)de \
--cc=phillip.wood@dunelm$(echo .)org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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