On Sat, 3 Jun 2006, Junio C Hamano wrote: > > I think this patch fixes the regression. Comments? The approach looks fine, but with your changes, the "deleted" flag makes no sense any more and looks redundant. It's not actually used for anything except deciding if we need to re-write the active_cache[] thing, and you migth as well use either "last" or "unmerged" for that. (yeah, "last" and "unmerged" becomes non-null one entry earlier than "deleted", but that's actually just confusing, I think, and now depends on the fact that we don't have to re-write the first entry). The whole "*dst++ = ce" _could_ be unconditional, the only reason I made it conditional at all is to avoid dirtying the mmap when not necessary (ie it's a performance optimization, and it's not one where that off-by-one matters). So I think you could make it clearer by dropping "deleted" entirely, and just making the store be conditional on "last". Linus - : 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