On Mon, Apr 9, 2012 at 13:05, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Shawn Pearce <spearce@xxxxxxxxxxx> writes: > >> ... And that niggly bit about subtrees sorting as >> though their names end in '/' even though they don't really matters. > > Yeah, in older and buggier unpack-trees it might have made the code > simpler while walking the index and the tree in parallel, but when we have > to deal with D/F conflicts, we have to find a entry with matching name > anyway, so it turned out not to be a win at all. JGit still waks the trees in parallel. We handle the D/F conflict stuff using a small amount of look-ahead and sometimes rescan back from the start. In practice that works out really well, it catches most forms of D/F conflict with little overhead, and almost no overhead when there is no D/F conflict, which is common. -- 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