From: Theodore Tso <tytso@mit.edu>
Date: Wed, 21 Jan 2009 21:03:48 GMT
Subject: Re: git diff, git mergetool and CRLF conversion
Message-ID: <20090121210348.GD9088@mit.edu>
In-Reply-To: <20090121172351.GB21727@hashpling.org>

On Wed, Jan 21, 2009 at 05:23:51PM +0000, Charles Bailey wrote:
> > Is this intended behaviour?  I'm using 1.6.1 on Cygwin.
> 
> Speaking for mergetool, I believe that it's simply because mergetool
> uses git cat-file which just outputs the raw contents of a blob and
> doesn't do any line ending conversion.
> 
> IMHO, I think that it should probably perform the 'convert to working
> tree format' change when preparing the temporary files. I'm not sure
> how best to do that, but perhaps it should be using git checkout-index
> with the --temp option instead of cat-file.

Yes, I agree, that would probably be better.

						- Ted