Re: What's in git.git (stable)

From: Junio C Hamano <junkio@cox.net>
Date: Mar 22, 2007, 21:30 UTC
Message-ID: <7vvegtrmnp.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <4602B810.40504@midwinter.com>

Steven Grimm <koreth@midwinter.com> writes:

Show 5 quoted lines

> Will you be applying your patch for the "checkout fails if something
> is a file in one branch and a directory in another" problem? I realize
> it's not a complete solution, but it's at least a significant
> improvement over the current behavior, and I don't imagine it breaks
> anything else.

If I understand correctly, the patch is already broken. Rather, the patch itself may be correct but it exposes more breakages that currently is hidden only because we do not replace bunch of files in a subdirectory with a single file in the index thanks to the "too strict" check that is bothering you. Lifting that check with the previous patch would make it either fail to notice other local changes (which is worse), or mistakenly say there is a local change when there is none (which is not better but not worse). In particular, I think it is highly suspicious what the current code with the patch does to paths that immediately follow the directory to be removed, although I stopped looking into this issue, as we already said this will not be dealt with in 1.5.1.

In short, I do not think the patch is suitable for production, as the cure seems worse than the disease.

That does not mean anybody is forbidden to look into a fix in the meantime. I am just saying I do not expect it to happen before 1.5.1.