From: Eyvind Bernhardsen Date: Mon, 10 May 2010 19:09:48 GMT Subject: Re: [PATCH/RFC] autocrlf: Make it work also for un-normalized repositories Message-ID: <99999847-7CFD-4F44-94BE-35AAE8CC9835@gmail.com> In-Reply-To: <20100510171119.GA17875@pvv.org> On 10. mai 2010, at 19.11, Finn Arne Gangstad wrote: > Previously, autocrlf would only work well for normalized > repositories. Any text files that contained CRLF in the repository > would cause problems, and would be modified when handled with > core.autocrlf set. > > Change autocrlf to not do any conversions to files that in the > repository already contain a CR. git with autocrlf set will never > create such a file, or change a LF only file to contain CRs, so the > (new) assumption is that if a file contains a CR, it is intentional, > and autocrlf should not change that. I'm of two minds about this: on the one hand, it appears to fix autocrlf's biggest problem (that it breaks down when the repository is not normalized), which was the main reason I started working on it in the first place. On the other hand, it does nothing for the user interface, which was (obviously :) another big motivator. I'll submit a cleaned-up series with optional extras in a couple of days. -- Eyvind