Re: error: core.autocrlf=input conflicts with core.eol=crlf

2014-12-05 Thread Torsten Bögershausen
at input from ~/.gitconfig, and execution aborts: error: core.autocrlf=input conflicts with core.eol=crlf It seems like the conflict check should be made at the end of the config file parsing, not on the fly. I was tempted to create a patch, however I am unfamilar with the codebase, and didn't

Re: error: core.autocrlf=input conflicts with core.eol=crlf

2014-12-05 Thread Alex Stangl
On Fri, Dec 05, 2014 at 04:55:51PM +0100, Torsten B?gershausen wrote: On 12/05/2014 09:10 AM, Torsten B?gershausen wrote: Or a test case showing the problem is welcome too. I mentioned some examples in my previous post. Here they are in condensed form. They assume core.eol isn't set in your

error: core.autocrlf=input conflicts with core.eol=crlf

2014-12-04 Thread Alex Stangl
. If the core.autocrlf=false comes first, then all is well and no conflict is reported. If the core.eol=crlf line comes first, then at the time this line is getting parsed, core.autocrlf is still set at input from ~/.gitconfig, and execution aborts: error: core.autocrlf=input conflicts with core.eol=crlf