Thread (10 messages) flat view 10 messages, 3 authors, 2016-06-15

Re: difftool -d symlinks, under what conditions

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:56:23

Possibly related (same subject, not in this thread)

John Keeping [off-list ref] writes:
On Wed, Mar 13, 2013 at 10:40:55AM -0700, Junio C Hamano wrote:
quoted
John Keeping [off-list ref] writes:
quoted
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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help