From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Mar 2013 19:28:27 GMT
Subject: Re: difftool -d symlinks, under what conditions
Message-ID: <7vy5dr14mc.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20130313180106.GL2317@serenity.lan>

John Keeping <john@keeping.me.uk> writes:

> On Wed, Mar 13, 2013 at 10:40:55AM -0700, Junio C Hamano wrote:
>> John Keeping <john@keeping.me.uk> writes:
>> 
>> > git-hash-object(1) implies that it will apply the clean filter and EOL
>> > conversion when it's given a path to a file in the working tree (as it
>> > is here).  Is that not the case?
>> 
>> Applying clean to smudged contents _ought to_ recover clean version,
>> but is that "ought to" something you would want to rely on?
>
> How does git-status figure out that file that has been touch'd does not
> have unstaged changes without relying on this?  Surely this case is no
> different from that?

I just checked.  ce_modified_check_fs() does ce_compare_data() which
does the same "hash the path and compare the resulting hash".  So I
think we are OK.

Thanks.