Re: [PATCH] Respect core.autocrlf when preparing temporary files for external diff

From: Sebastian Schuberth <sschuberth@gmail.com>
Date: Mar 22, 2009, 15:30 UTC
Message-ID: <bdca99240903220830u50999dfcnee0f0091b4dec835@mail.gmail.com>
In-Reply-To: <20090322074643.GA4826@coredump.intra.peff.net>

Show 10 quoted lines

>> While the purist in me says #1 above is the right argument to make for
>> feeding "clean" version, I suspect that the textconv or extdiff tools more
>> often are not made from scratch and ported across platforms than are
>> cobbled up together out of tools the script writer finds on his platform.
>> I suspect that Dscho's "a tempfile should look like a checkout" would be
>> much friendlier to them in practice for this reason.
>
> I think you and I have about the same feeling on this, then. As somebody
> who does not actually use smudge/clean filters at all, I am willing to
> defer to Dscho's opinion, which is based on practical experience.

Me being the reporter of the original msysGit issue #177, I'd like to clarify that my intention not necessarily was to make "core.autocrlf=true" affect temporary files (i.e. to "smudge" them), but to ensure that the files fed into "git diff" are always generated / acquired in a consistent way, so that they are in fact comparable. I'd also be happy with a solution that always feeds clean files into "git diff", although that would probably mean that we could not reuse working tree files if "core.autocrlf=true" is set.

Maybe it's a good idea to look at how gitk displays the diff, for an orientation. If the diff gitk shows is based on smudged files, git diff should probably also always be fed with smudged files, and if the diff gitk shows is based on clean files, git diff should probably also always be fed with clean files.

-- 
Sebastian Schuberth