From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Jake Zimmerman <jake@zimmerman.io>,
Lidong Yan <yldhome2d2@gmail.com>,
git@vger.kernel.org
Subject: Re: Regression in `git diff --quiet HEAD` when a new file is staged
Date: Sat, 18 Oct 2025 08:23:13 -0700 [thread overview]
Message-ID: <xmqqh5vww7xa.fsf@gitster.g> (raw)
In-Reply-To: <20251018094037.GA1060824@coredump.intra.peff.net> (Jeff King's message of "Sat, 18 Oct 2025 05:40:37 -0400")
Jeff King <peff@peff.net> writes:
> I'm not sure which of these you mean:
>
> - Do we still need to call diff_flush_patch_quietly() directly below
> the hunk above, in diff_flush()?
>
> - Do we still need the dry-run code at all?
Both. We do not have to call flush_quietly() and can call the real
thing with output disabled. The dry-run bit was only added to
implement the flush_quietly() variant. If we lose the only caller
to flush_quietly(), all of the supporting infrastructure can go.
It concentrates only on the regression-fix aspect of the changes.
Going forward, my preference is:
* Apply your patch. This is the base of the fix for 'maint' and
all branches.
* As Lidong updates dry-run code by adding more "ah we are in
dry-run, so we should stop at the first change and se should be
silent" fixes, we can queue them on the 'master' front for the
preparation for a better future. Note that the 'master' front
would contain your "In from_contents modes, run flush_quietly()
with output redirected to /dev/null".
* Once we regain enough confidence for dry-run with the above
effort, we mark your "why not redirect to /dev/null for extra
protection?" code with NEEDSWORK comment to be removed after a
thorough code audit to ensure that dry-run is now sound.
And I do not mind if the NEEDSWORK comment stay there for extended
period of time.
Thanks.
next prev parent reply other threads:[~2025-10-18 15:23 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-17 0:09 Regression in `git diff --quiet HEAD` when a new file is staged Jake Zimmerman
2025-10-17 7:51 ` Jeff King
2025-10-17 8:36 ` [PATCH] diff: restore redirection to /dev/null for diff_from_contents Jeff King
2025-10-17 18:22 ` Junio C Hamano
2025-10-19 21:09 ` Johannes Schindelin
2025-10-21 7:52 ` Jeff King
2025-10-17 11:44 ` Regression in `git diff --quiet HEAD` when a new file is staged Johannes Schindelin
2025-10-17 17:45 ` Junio C Hamano
2025-10-18 1:04 ` Lidong Yan
2025-10-18 9:42 ` Jeff King
2025-10-18 9:40 ` Jeff King
2025-10-18 15:23 ` Junio C Hamano [this message]
2025-10-21 7:36 ` Jeff King
2025-10-21 14:38 ` Junio C Hamano
2025-10-22 4:46 ` Lidong Yan
2025-10-22 9:14 ` Jeff King
2025-10-22 14:20 ` Lidong Yan
2025-10-22 14:31 ` Junio C Hamano
2025-10-22 16:28 ` Junio C Hamano
2025-10-22 9:11 ` Jeff King
2025-10-22 16:48 ` Junio C Hamano
2025-10-23 12:01 ` Jeff King
2025-10-23 12:15 ` Jeff King
2025-10-23 13:35 ` Junio C Hamano
2025-10-22 17:39 ` Junio C Hamano
2025-10-23 0:33 ` Lidong Yan
2025-10-23 13:42 ` 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=xmqqh5vww7xa.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jake@zimmerman.io \
--cc=peff@peff.net \
--cc=yldhome2d2@gmail.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 NNTP newsgroup(s).