On 24. mai 2010, at 14.47, Dmitry Potapov wrote: > On Mon, May 24, 2010 at 11:49:05AM +0200, Clemens Buchacher wrote: >> With CRLF file in the repository, core.autocrlf=true and >> core.eol=lf, > > I wonder if this combination should be allowed. core.autocrlf=true > always implied that the native EOL is CRLF. So I do not think any > reasonable behavior can be deduced for this combination. Can you > imagine _anyone_ who would want to have such settings? Otherwise, > it is better to error out if this combination is encountered. It errors out when core.autocrlf=input conflicts with core.eol, but allows an explicitly set core.eol to override (with no warning) when core.autocrlf=true. That way, the meaning of core.autocrlf can later be changed to simply enable normalization without touching the output format--unfortunately removing any sense to the name. Leaving core.autocrlf to mean what its name implies would require a new config variable (core.autotext?) for people who want automatic normalization but LFs in their working directory. I'll be semi-offline for the next week or so, so any update of the series will have to wait until I get back. -- Eyvind -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html