git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [BUG] git cherry-pick segfaults with local changes in working directory

From
Jeff King <peff@peff.net>
Date
Jun 15, 2017, 10:32 UTC
Message-ID
<20170615103215.45sp5adzu6zcorct@sigill.intra.peff.net>
In-Reply-To
<1497517910.2239.105.camel@centricular.com>
On Thu, Jun 15, 2017 at 12:11:50PM +0300, Sebastian Dröge wrote:
Show 8 quoted lines
> 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.

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

Curiously, after the fix we print:
error: addinfo_cache failed for path 'docs/plugins/inspect/plugin-shout2send.xml'

but the cherry-pick succeeds anyway. I'm not sure if that's a bug or not.

-Peff
Previous: Sebastian DrögeNext: Sebastian Dröge
Message 2 of 4 in “[BUG] git cherry-pick segfaults with local changes in working directory”
  1. Sebastian DrögeJun 15, 2017
  2. Jeff KingJun 15, 2017
  3. Sebastian DrögeJun 15, 2017
  4. Jeff KingJun 15, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.