From: Theodore Tso <tytso@mit.edu>
To: Charles Bailey <charles@hashpling.org>
Cc: Hannu Koivisto <azure@iki.fi>, git@vger.kernel.org
Subject: Re: git diff, git mergetool and CRLF conversion
Date: Wed, 21 Jan 2009 16:03:48 -0500 [thread overview]
Message-ID: <20090121210348.GD9088@mit.edu> (raw)
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
next prev parent reply other threads:[~2009-01-21 22:08 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-21 16:55 git diff, git mergetool and CRLF conversion Hannu Koivisto
2009-01-21 17:23 ` Charles Bailey
2009-01-21 21:03 ` Theodore Tso [this message]
2009-01-21 22:57 ` [PATCH] mergetool: respect autocrlf by using checkout-index Charles Bailey
2009-01-23 17:20 ` Junio C Hamano
2009-01-23 18:18 ` Charles Bailey
2009-01-26 16:15 ` Hannu Koivisto
2009-01-26 16:31 ` Charles Bailey
2009-01-26 21:28 ` Junio C Hamano
2009-01-26 22:08 ` Junio C Hamano
2009-01-26 23:09 ` Junio C Hamano
2009-01-27 13:58 ` Hannu Koivisto
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090121210348.GD9088@mit.edu \
--to=tytso@mit.edu \
--cc=azure@iki.fi \
--cc=charles@hashpling.org \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.