From: Johannes Schindelin Date: Fri, 18 Jan 2008 13:09:32 GMT Subject: Re: What's not in 'master', and likely not to be until 1.5.4 Message-ID: In-Reply-To: <7E3714CE-0073-4E42-A455-36D595946A6C@zib.de> Hi, On Fri, 18 Jan 2008, Steffen Prohaska wrote: > > On Jan 18, 2008, at 11:40 AM, Junio C Hamano wrote: > > > * crlf (Steffen Prohaska and Dmitry Potapov) > > I am working on an alternative to the patch I sent last week. I hope I > can present the two approaches soon. > > The first approach is a lazy check in crlf_to_git() that warns about an > irreversible conversion; or dies if safecrlf=true. This is relatively > simple code but at least for git-add a workaround is needed to suppress > printing a warning twice. The runtime overhead is negligible. > > The second approach adds a new machinery is_worktree_crlfsafe() > that could be run independently of the crlf_to_git() conversion. >From the sound of it, I like the first approach much better. > I do not expect that this topic will be ready for 1.5.4. What with our ongoing discussion when to go out of preview phase for msysGit, I think this makes sense. Ciao, Dscho