From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 26 Jul 2007 05:40:44 GMT
Subject: Re: git stash apply segfaulting when called in subdir
Message-ID: <Pine.LNX.4.64.0707260635060.14781@racer.site>
In-Reply-To: <20070726050726.GC32617@coredump.intra.peff.net>

Hi,

On Thu, 26 Jul 2007, Jeff King wrote:

> On Wed, Jul 25, 2007 at 03:28:12PM -0700, Junio C Hamano wrote:
> 
> > > zeisberg@cassiopeia:/tmp/repo$ cd dir; git stash apply
> > > error: missing object referenced by '696146c2a44d7fc4d5ae4a71589c4c0d84f59789'
> > > /home/zeisberg/usr/bin/git-stash: line 111: 13618 Segmentation fault      git-merge-recursive $b_tree -- $c_tree $w_tree
> > 
> > This probably is a merge-recursive bug, but in the meantime,
> > I think this should fix it.
> 
> The merge-recursive bug is simply a failure to check for invalid input.

No it is not.

The objects are there.  But the objects cannot be found, since 
merge-recursive cannot go to top level.

Ciao,
Dscho