From: Sebastian Schuberth Date: Thu, 12 May 2011 10:15:24 GMT Subject: git cherry-pick --strategy=resolve segfaults if picking a root commit Message-ID: 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