Re: [PATCH 2/2] diff: teach diff to read gitattribute diff-algorithm

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 15, 2023, 05:20 UTC
Message-ID: <xmqqo7pv1p3o.fsf@gitster.g>
In-Reply-To: <Y+xdvck3ZKZCewim@coredump.intra.peff.net>

Jeff King <peff@peff.net> writes:

Show 8 quoted lines

>> >   git show 35bd13fcd2caa4185bf3729655ca20b6a5fe9b6f builtin/add.c
>> 
>> "fatal: bad object 35bd13fcd2caa4185bf3729655ca20b6a5fe9b6f"
>> 
>> Is that a local commit of yours?
>
> Oh, sorry. It's not my commit, but it may have been something I picked
> up off the list. The version from Junio is 20b813d7d3d.

$ git show -s --notes=amlog --format='%N %s' 20b813d7d3d
Message-Id: <patch-v2-1.3-71c7922b25f-20230206T225639Z-avarab@gmail.com>
 add: remove "add.interactive.useBuiltin" & Perl "git add--interactive"

Show 6 quoted lines

> FWIW, I coincidentally hit this case earlier today where patience does a
> _much_ better job than myers:
>
>   https://lore.kernel.org/git/Y+vV8Ifkj1QV7KF0@coredump.intra.peff.net/
>
> So don't count me as an objection, but just a curious observer. ;)

Yeah, I know some people consider that Patience is the best thing since sliced bread, and it does produce more readable diffs often. I haven't used it often enough to cite/remember a bad case, though.