Re: What's cooking in git.git (May 2024, #06; Tue, 14)

From: René Scharfe <l.s.r@web.de>
Date: May 16, 2024, 16:00 UTC
Message-ID: <17ca35d2-f9a5-4e97-9562-82ab83ddf995@web.de>
In-Reply-To: <xmqqcypo47p7.fsf@gitster.g>

Am 14.05.24 um 19:36 schrieb Junio C Hamano:

Show 10 quoted lines

> * rs/external-diff-with-exit-code (2024-05-06) 2 commits
>   (merged to 'next' on 2024-05-08 at ad5fee3cbf)
>  + diff: fix --exit-code with external diff
>  + diff: report unmerged paths as changes in run_diff_cmd()
>
>  The "--exit-code" option of "git diff" command learned to work with
>  the "--ext-diff" option.
>
>  Will merge to 'master'.
>  source: <82561c70-ec33-41bf-b036-52310ffc1926@web.de>

Oh, and it already hit master while I wasn't paying attention! Patch 1 is fine, but 11be65cfa4 (diff: fix --exit-code with external diff, 2024-05-05) is flawed: It assumes external diffs write to their stdout, which is not documented and not necessarily true or practical for GUI tools. Could you please revert it for now?

My current understanding is that we can optionally let external diffs report that two files have no meaningful differences using exit code 1, requiring no further config settings or output piping. t7800-difftool.sh disagrees, however, and I have yet to look into these test failures -- and write a bunch more tests.

Sorry for the kerfuffle.

René