From: Ferry Huberts (Pelagic) Date: Mon, 23 Feb 2009 07:29:57 GMT Subject: Re: autocrlf=input and safecrlf (was Re: CVS import [SOLVED]) Message-ID: <59288.77.61.241.211.1235374197.squirrel@hupie.xs4all.nl> In-Reply-To: <20090223071056.GA29241@coredump.intra.peff.net> On Mon, February 23, 2009 08:10, Jeff King wrote: > On Mon, Feb 23, 2009 at 08:09:03AM +0100, Ferry Huberts (Pelagic) wrote: > >> > But won't that now import CRLF's into your new git repo? Especially on >> > Windows, where (IIRC) cvs gives you files with CRLF by default? >> >> Yes it would. But sadly that's the only way to make sure that the import >> will work (without serious manual intervention). >> I found this out the hard way. > > Wouldn't setting autocrlf=true, safecrlf=true do the import you want? > Then you could reset autocrlf to input after import but before checkout > time. No. As I demonstrated in my testing setup the combination of autocrlf=true and safecrlf=true ALWAYS makes the import NOT work (for repositories that have CRLF files). In my own experience I also found that the combination of autocrlf=input and safecrlf=true ALWAYS makes the import NOT work for PRATICAL repositories. That lead me to the conclusion to require safecrlf=false. From the discussion and arguments from you it appeared that that wouldn't be enough. Therefore I think that we have to require autocrlf=false (which makes git ignore the safecrlf setting). Ferry