From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sun, 05 Apr 2009 11:50:48 GMT
Subject: Re: Segfault on merge with 1.6.2.1
Message-ID: <alpine.DEB.1.00.0904051350350.10279@pacific.mpi-cbg.de>
In-Reply-To: <1238892420-721-1-git-send-email-drizzd@aon.at>

Hi,

On Sun, 5 Apr 2009, Clemens Buchacher wrote:

> The segmentation fault is caused by a null pointer dereference which 
> happens during recursive merge with a submodule conflict between two 
> merge bases. This is fixed by the following patches.
> 
> However, there are other problems with merging submodules. For example, 
> git diff aborts with "fatal: read error 'sub'" for conflicting 
> submodules. I have also added a test for this.
> 
> Dscho has already started working on related issues. I have therefore 
> skipped t7404, which is already used in Dscho's work.

Thanks for working on this,
Dscho