Re: unclear docs

2019-01-29 Thread Sergey Lukashev
This is in fact how I got it but it seems to have changed since then. 29.01.2019, 10:38, "Torsten Bögershausen" : > > The property was originally meant to say: > - Either the "text" attribute is set in .gitattributes >   or > - The "text=auto" attribute is set in .gitattributes and >   Git auto-de

Re: unclear docs

2019-01-28 Thread Torsten Bögershausen
On Mon, Jan 28, 2019 at 01:31:17PM -0500, Jeff King wrote: > On Mon, Jan 28, 2019 at 09:12:00PM +0300, Sergey Lukashev wrote: > > > Thank you. Does the paragraph about core.eol refers to the text > > attribute? It's written 'property' there. I was thinking it means > > whether git thinks file is te

Re: unclear docs

2019-01-28 Thread Jeff King
On Mon, Jan 28, 2019 at 11:16:54PM +0300, Sergey Lukashev wrote: > >>  > Subject: [PATCH] doc/gitattributes: clarify "autocrlf overrides eol" > >>  > > >>  > We only override core.eol with core.autocrlf when the latter is set to > >>  > "true" (otherwise, core.eol would never do anything!). Let's

Re: unclear docs

2019-01-28 Thread Sergey Lukashev
autocrlf can be "input" as well. 28.01.2019, 21:32, "Jeff King" : > On Mon, Jan 28, 2019 at 10:30:31AM -0800, Junio C Hamano wrote: > >>  Jeff King writes: >> >>  > I think it means: >>  > >>  > - if core.autocrlf is false (the default), then the text attribute and >>  > core.eol are used >>  > >

Re: unclear docs

2019-01-28 Thread Jeff King
On Mon, Jan 28, 2019 at 10:30:31AM -0800, Junio C Hamano wrote: > Jeff King writes: > > > I think it means: > > > > - if core.autocrlf is false (the default), then the text attribute and > > core.eol are used > > > > - if core.autocrlf is true, then that overrides the whole > > attri

Re: unclear docs

2019-01-28 Thread Jeff King
On Mon, Jan 28, 2019 at 09:12:00PM +0300, Sergey Lukashev wrote: > Thank you. Does the paragraph about core.eol refers to the text > attribute? It's written 'property' there. I was thinking it means > whether git thinks file is text, using .gitattributes OR otherwise. > Maybe changing this word wi

Re: unclear docs

2019-01-28 Thread Junio C Hamano
Jeff King writes: > I think it means: > > - if core.autocrlf is false (the default), then the text attribute and > core.eol are used > > - if core.autocrlf is true, then that overrides the whole > attribute/eol system I think that matches my understanding. > Subject: [PATCH] doc/git

Re: unclear docs

2019-01-28 Thread Sergey Lukashev
Thank you. Does the paragraph about core.eol refers to the text attribute? It's written 'property' there. I was thinking it means whether git thinks file is text, using .gitattributes OR otherwise. Maybe changing this word will make it clearer? 28.01.2019, 19:09, "Jeff King" : > On Sun, Jan 27,

Re: unclear docs

2019-01-28 Thread Torsten Bögershausen
On Sun, Jan 27, 2019 at 02:55:23PM +0300, Sergey Lukashev wrote: > A follow up on my previous mail. > > Well, I have two problems: > 1) The endings I get with core.autocrlf=false depend on whether I have * > text=auto (a file was commited with LFs). At least in git 2.20.1 > 2) If the quote holds t

Re: unclear docs

2019-01-28 Thread Jeff King
On Sun, Jan 27, 2019 at 12:58:58PM +0300, Sergey Lukashev wrote: > Could somebody please explain what 'core.autocrlf overrides core.eol' > means given that we have the following statement in core.eol docs: > "Sets the line ending type to use in the working directory for files > that have the text 

Re: unclear docs

2019-01-28 Thread Jeff King
On Sun, Jan 27, 2019 at 02:55:23PM +0300, Sergey Lukashev wrote: > Well, I have two problems: > 1) The endings I get with core.autocrlf=false depend on whether I have >* text=auto (a file was commited with LFs). At least in git 2.20.1 That sounds right. The default is that Git will never touc

Re: unclear docs

2019-01-27 Thread Sergey Lukashev
A follow up on my previous mail. Well, I have two problems: 1) The endings I get with core.autocrlf=false depend on whether I have * text=auto (a file was commited with LFs). At least in git 2.20.1 2) If the quote holds true then autocrlf=false is actually "true" (for output conversion) on Windo

unclear docs

2019-01-27 Thread Sergey Lukashev
Hello! Could somebody please explain what 'core.autocrlf overrides core.eol' means  given that we have the following statement in core.eol docs: "Sets the line ending type to use in the working directory for files that have the text property set when core.autocrlf is false". I would like to know