From: Sebastian Dröge <sebastian@centricular.com>
Date: Thu, 15 Jun 2017 10:37:36 GMT
Subject: Re: [BUG] git cherry-pick segfaults with local changes in working directory
Message-ID: <1497523056.2239.107.camel@centricular.com>
In-Reply-To: <20170615103215.45sp5adzu6zcorct@sigill.intra.peff.net>

Hi Jeff,

Thanks for the fast reply!

On Thu, 2017-06-15 at 06:32 -0400, Jeff King wrote:
> On Thu, Jun 15, 2017 at 12:11:50PM +0300, Sebastian Dröge wrote:
> 
> > This is with git 2.11.0 (Debian 2.11.0-4) and can be reproduced with
> > the packed checkout here:
> >   https://people.freedesktop.org/~slomo/git-cherry-pick-segfault_gst-plugins-good.tar.xz
> > 
> > $ tar xf git-cherry-pick-segfault_gst-plugins-good.tar.xz
> > $ cd gst-plugins-good
> > $ git cherry-pick 0421fb04470af90e8810e7e5e69955d3192896ba
> > Segmentation fault (core dumped)
> 
> Note that the tarball doesn't have all the necessary objects. Its
> .git/objects/info/alternates points to another full clone of
> git://anongit.freedesktop.org/gstreamer/gst-plugins-good.

Ah good to know, I thought this only happens if you clone with
--reference and not otherwise.

> The segfault was fixed in 55e9f0e5c (merge-recursive: handle NULL in
> add_cacheinfo() correctly, 2016-11-26), which is in v2.11.1.

I can confirm that this also fixes my specific problem. Thanks!

-- 
Sebastian Dröge, Centricular Ltd · http://www.centricular.com