Thread (1 message) 1 message, 1 author, 2016-06-15

Re: Surprising interaction of "binary" and "eol" gitattributes

From: Junio C Hamano <hidden>
Date: 2016-06-15 23:04:08

Torsten Bögershausen [off-list ref] writes:
On 03/10/2015 11:54 PM, Junio C Hamano wrote:
quoted
Michael Haggerty [off-list ref] writes:
quoted
Well, that's true, but the "eol" attribute can regain its effect if
"binary" is followed by "text" or "text=auto". So I guess the simplest
question is as follows. Suppose I have the following .gitattributes:

     a.foo eol=crlf
     a.foo binary
     a.foo text
As binary is not just -text and turns other things off, those other
things will be off after these three.
Not sure if I follow:
Whenever you specify -text, the eol doesn't matter, or what do I miss ?
Something unrelated to the main theme of this topic ;-).

I was just saying that saying "a.foo text" is not a way to take your
earlier mistake of saying "a.foo binary" back, if that "binary" was
placed on the path by mistake or an over-eager globbing.  The 'text'
attribute will be reset, but -diff you placed on the path by saying
"binary" is still there after these three attribute lines and running
"git diff a.foo" would sill show the effect from it.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help