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

git cherry-pick --strategy=resolve segfaults if picking a root commit

From
Sebastian Schuberth <sschuberth@gmail.com>
Date
May 12, 2011, 10:15 UTC
Message-ID
<iqgbvs$pm5$1@dough.gmane.org>
Hi,

I just noticed that (under both Linux and Windows) Git 1.7.5 segfaults for me if cherry-picking a root commit from one repo into another one with "--strategy=resolve". It does not segfault if "--strategy=resolve" is omitted. Here's what I did:

# Create a repository with only a root commit. mkdir repo1 cd repo1 git init

echo "test1" > test1 git add test1 git commit -m "test1"

# Create another repository with only a root commit. mkdir ../repo2 cd ../repo2 git init

echo "test2" > test2 git add test2 git commit -m "test2"

git remote add repo1 ../repo1 git fetch repo1

# Cherry-pick with "--strategy=resolve" -> segfaults. git cherry-pick --strategy=resolve repo1/master

Is this already a known issue?
-- 
Sebastian Schuberth
Next: Jeff King
Message 1 of 12 in “git cherry-pick --strategy=resolve segfaults if picking a root commit”
  1. Sebastian SchuberthMay 12, 2011
  2. Jeff KingMay 12, 2011
  3. Jeff KingMay 12, 2011
  4. 1/3 cherry-pick: handle root commits with external strategiesJeff King, May 12, 2011
  5. Sebastian SchuberthMay 12, 2011
  6. 2/3 revert: allow reverting a root commitJeff King, May 12, 2011
  7. Sebastian SchuberthMay 12, 2011
  8. 3/3 t3503: test cherry picking and reverting root commitsJeff King, May 12, 2011
  9. Johannes SixtMay 12, 2011
  10. Jeff KingMay 12, 2011
  11. Jeff KingMay 16, 2011
  12. Junio C HamanoMay 16, 2011

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.