On Thu, 29 Mar 2007, Linus Torvalds wrote: > > It's not the initial commit. It's a criss-cross merge, and it's a virtual > commit created by a previous level of merging. > > Apply this patch to see it blow up much earlier, when that bogus commit > with a NULL tree is created. > > (I didn't debug *why* that happens, but maybe this gets somebody further) Well, it happens because "git_write_tree()" returns NULL. Which in turn is because "unmerged_index()" returns true. merge_trees() tries to clean up the unmerged index, but apparently doesn't do good enough of a job, so git_write_tree() is called with entries still unmerged.. Linus - 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