On Mon, Jun 11, 2012 at 05:47:05PM -0400, Jeff King wrote: > > I just checked the history of unpack-trees code (which is the > > underlying machinery of read-tree, which in turn is the machinery > > used to check out another branch by "git checkout"), and I suspect > > that this particular case has never worked. > > Yeah, I verified it back to v1.6.x, but didn't bother going further > back. Actually, it was broken by c819353 (Fix switching to a branch with D/F when current branch has file D., 2007-03-15). However, before that the check was too tight, and says: fatal: Untracked working tree file 'something' would be removed by merge. which is not really correct, either. -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html