On Jan 18, 2008, at 11:40 AM, Junio C Hamano wrote:

quoted text
> Here is an update to the list I sent earlier.  Topics that I
> thought may deserve attention, discussion and eventual inclusion
> but are not 1.5.4 material.
>
> I think some of them actually have a slight chance of being
> 1.5.4 material, if interested parties present good enough
> arguments that they are actually good and safe bugfixes.
>
[...]
quoted text
>
>  * 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.
The code doing the conversion would stay unmodified.  The
advantage is that the whole work tree could be verified before
any conversion actually happens and we could die() after printing
all the warnings instead of printing only the first one.  The
drawback is that this approach most likely needs more code and
will introduce runtime overhead.  A straight forward
implementation would add another pass over the work tree running
the stats in convert.c.  So the stats would be run twice.
And for a simple "git add <file>" the situation is even worse:
the full work tree would be verified even is only a single file
is to be added.

I haven't found time during the week, so I'll continue to work
on this over the weekend.  Maybe even more time is needed to
discuss the two alternatives.

I do not expect that this topic will be ready for 1.5.4.

	Steffen


-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html