From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 07 May 2009 09:48:26 GMT
Subject: Re: Segfault during merge
Message-ID: <alpine.DEB.1.00.0905071144370.18521@pacific.mpi-cbg.de>
In-Reply-To: <alpine.DEB.2.00.0905070102010.30999@narbuckle.genericorp.net>

Hi,

On Thu, 7 May 2009, Dave O wrote:

> Hi, I've encountered a particular merge that causes a segfault, and was
> able to successfully bisect git to commit 36e3b5e.

As you already found the commit, you could have Cc:ed me already.  It is 
pure luck that I did not miss your bug report.

> However, I'm unable to come up with a simple repro that doesn't involve 
> the source tree that I found it on, which unfortunately I'm not able to 
> share.

Sigh.

> I've debugged this a bit, and it seems to happen only when there's
> sufficient file creations and deletions to surpass rename_limit in
> diffcore_rename, and a rename/delete conflict is encountered.

Maybe you can set merge.renameLimit really small, and then reproduce?

Ciao,
Dscho