Re: diff --cached --no-ext-diff --find-copies-harder --quiet exits with wrong status code
- From
D. Ben Knoble <ben.knoble@gmail.com>
- Date
- Nov 8, 2025, 19:12 UTC
- Message-ID
- <CALnO6CA187833M7SFDTrbSaTOpo5vSt3UGUFEiLGpiJnk_ekmg@mail.gmail.com>
- In-Reply-To
- <CALnO6CBsXEpeCTS=FpcOvXEOw7sNGT8fdb4Z8PBewoW0iRMnXQ@mail.gmail.com>
On Sat, Nov 8, 2025 at 2:08 PM D. Ben Knoble <ben.knoble@gmail.com> wrote:
Show 11 quoted lines
> > On Sat, Nov 8, 2025 at 2:05 PM D. Ben Knoble <ben.knoble@gmail.com> wrote: > > > > AFAICT, you need all of the mentioned options to trigger the bug. > > Allowing ext-diff works fine, I don't think it's triggered in > > non-cached diffs, and I've never seen it without --find-copies-harder. > > Notably, s/quiet/exit-code works just fine. > > > I think I also spotted a difference in diff_from_contents, but not > sure if that's relevant.
Yeesh. You know how writing for others clarifies thoughts? Well...
I just noticed that diff_setup_done tweaks diff_from_contents based on whether external diffs are allowed. Possibly relevant? I haven't been able to easily identify a place where all 3 relevant options come together, but this would be 2 of them (quiet and ext-diff).
-- D. Ben Knoble