Re: git-diff in a worktree is an order of magnitude slower?
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 21, 2026, 21:39 UTC
- Message-ID
- <xmqqechz60ah.fsf@gitster.g>
- In-Reply-To
- <20260621174518.GB2206349@coredump.intra.peff.net>
Jeff King <peff@peff.net> writes:
Show 16 quoted lines
> BTW, I don't think diffcore actually has the information it would need > to do so. The racy stuff is handled under the hood in ie_match_stat(), > which returns only a set of "changed" flags. So the caller cannot tell > the difference between the two cases: > > 1. We checked ce_match_stat_basic() which said "no change", and then > is_racy_timestamp() was false, so that was good enough. > > 2. is_racy_timestamp() is true, so we further did a content check, > found nothing, and returned the same "no change" > > Obviously we could pass back another flag, but that would disrupt the > other callers. Hmm. It looks like we could pass in a flag to say "assume > racy entries are modified". And then they come back to the diff code, > diffcore_skip_stat_unmatch() sees they're not real diffs and suppresses > them, but we _do_ count them as stat-dirty.
Yeah. Because ie_match_stat() does have access to istate, we could add a new member to istate, next to "updated_workdir" and friends, and smudge the bit when the is_racy_timestamp() goes to the compare-data codepath and finds that we are better off auto refreshing. Then "were we told to do skip-stat-unmatch and actually found some that is worth refreshing?" code can be taught to pay attention to that bit as well.
This is a tangent, but why do we call refresh_index_quietly() in the central code path in cmd_diff() in the first place, I have to wonder? It should not matter when we are comparing two tree objects (or two commits), at least. It of course is not hurting, though.