On Wed, Dec 13, 2023 at 10:33:00PM -0500, Eric Sunshine wrote: > On Wed, Dec 13, 2023 at 10:11 AM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > Patrick Steinhardt <ps@xxxxxx> writes: > > >> I do not think "prefer host Git" is necessarily a good idea; falling > > >> back to use host Git is perfectly fine, of course. > > > > > > Why is that, though? > > > > Mostly because your "differences in features supported by just-built > > one and what happens to be on $PATH can cause problems" cuts both > > ways [...] > > I sent an alternative solution[1] which should sidestep this objection. > > As usual, I forgot to use --in-reply-to=<this-thread> when sending the > patch, even though I reminded myself to use it only a minute or so > earlier. Sorry. > > [1]: https://lore.kernel.org/git/20231214032248.1615-1-ericsunshine@xxxxxxxxxxx/ Thanks, I've replied to the thread. I think by now there are three different ideas: - Improve the logic to pick some kind of diff implementation, which is my patch series. It would need to be improved so that we also probe whether the respective Git executables actually understand the repo format so that we can fall back from the just-built Git to system's Git. - Munge the whitespace of the expected results with some regexes. I like that idea better because we can avoid the git-diff(1) problem, but find that the result is somewhat hard to read. - Fix the ".expect" files so that we can avoid all of these games. I actually like the last option most. I'll have a go at it and send this third version out in a bit. Patrick
Attachment:
signature.asc
Description: PGP signature
