From: "René Scharfe" <l.s.r@web.de>
To: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: What's cooking in git.git (May 2024, #06; Tue, 14)
Date: Thu, 16 May 2024 18:00:13 +0200 [thread overview]
Message-ID: <17ca35d2-f9a5-4e97-9562-82ab83ddf995@web.de> (raw)
In-Reply-To: <xmqqcypo47p7.fsf@gitster.g>
Am 14.05.24 um 19:36 schrieb Junio C Hamano:
> * 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é
prev parent reply other threads:[~2024-05-16 16:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-14 17:36 What's cooking in git.git (May 2024, #06; Tue, 14) Junio C Hamano
2024-05-15 11:57 ` Christian Couder
2024-05-15 14:16 ` Junio C Hamano
2024-05-15 19:33 ` Phillip Wood
2024-05-16 16:00 ` René Scharfe [this message]
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=17ca35d2-f9a5-4e97-9562-82ab83ddf995@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).