On Tue, Feb 15, 2011 at 10:46:03AM -0800, Junio C Hamano wrote: > Jeff King <peff@xxxxxxxx> writes: > > > Interesting. I looked at both sides of the merge and the merge base, and > > there definitely should not be a conflict there. The regression bisects > > to 83c9031 (unpack_trees(): skip trees that are the same in all input, > > 2010-12-22). Reverting that commit makes the problem go away. > > Thanks; I was wondering about this myself but you bisected it faster. > > Will revert. One other thing I noticed during the bisect: when using a version of git containing 83c9031, the merge took a lot longer. As in, 13 seconds with v1.7.3 versus 69 seconds with master. That may simply be because the bug being demonstrated causes us to erroneously do more file-level merging than we would otherwise need to. But I thought it worth mentioning in case you want to delve into fixing the code. -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