From: Ferry Huberts (Pelagic) Date: Mon, 16 Feb 2009 20:32:13 GMT Subject: Re: CVS import [SOLVED] Message-ID: <60044.192.168.0.51.1234816333.squirrel@hupie.xs4all.nl> In-Reply-To: <7291.77.61.241.211.1234790434.squirrel@hupie.xs4all.nl> On Mon, February 16, 2009 14:20, Ferry Huberts (Pelagic) wrote: > I solved it: > > it has to do with the > core.autocrlf=input > core.safecrlf=true > > settings I had in my global config. > Maybe the manual page should warn against having these defined? > I'm working on it now, and did some more testing: it's actually the safecrlf setting, not the autocrlf option. Which leaves me with some questions of what to do exactly: autocrlf safecrlf 1 false false 2 false warn 3 false true 4 input false 5 input warn 6 input true 7 true false 8 true warn 9 true true 1- git ignores the safecrlf flag; obviously acceptable 2- git ignores the safecrlf flag; so acceptable 3- git ignores the safecrlf flag, so acceptable 4- seems acceptable to me 5- seems acceptable to me 6- unacceptable 7- seems acceptable to me 8- seems acceptable to me 9- unacceptable So, 6 and 9 (safecrlf==true) are definitely unacceptable. 1-3 are definitely acceptable. How about the others? Should these produce warnings? Should the user use a 'force' option to make the import work (and acknowledge that he's calling for trouble) Should we enforce some setting? Which flags/setting? Input appreciated :-) Ferry