Re: SEGV in git-merge recursive:

From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mar 29, 2007, 19:40 UTC
Message-ID: <Pine.LNX.4.64.0703291237240.6730@woody.linux-foundation.org>
In-Reply-To: <Pine.LNX.4.64.0703291232190.6730@woody.linux-foundation.org>

On Thu, 29 Mar 2007, Linus Torvalds wrote:

Show 8 quoted lines

> 
> 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