All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sebastian Schuberth <sschuberth@gmail.com>
To: git@vger.kernel.org
Subject: git cherry-pick --strategy=resolve segfaults if picking a root commit
Date: Thu, 12 May 2011 12:15:24 +0200	[thread overview]
Message-ID: <iqgbvs$pm5$1@dough.gmane.org> (raw)

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

             reply	other threads:[~2011-05-12 10:16 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-12 10:15 Sebastian Schuberth [this message]
2011-05-12 10:45 ` git cherry-pick --strategy=resolve segfaults if picking a root commit Jeff King
2011-05-12 11:08   ` Jeff King
2011-05-12 11:09     ` [PATCH 1/3] cherry-pick: handle root commits with external strategies Jeff King
2011-05-12 14:50       ` Sebastian Schuberth
2011-05-12 11:09     ` [PATCH 2/3] revert: allow reverting a root commit Jeff King
2011-05-12 14:53       ` Sebastian Schuberth
2011-05-12 11:10     ` [PATCH 3/3] t3503: test cherry picking and reverting root commits Jeff King
2011-05-12 12:20       ` Johannes Sixt
2011-05-12 12:37         ` Jeff King
2011-05-16 10:27     ` git cherry-pick --strategy=resolve segfaults if picking a root commit Jeff King
2011-05-16 15:01       ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='iqgbvs$pm5$1@dough.gmane.org' \
    --to=sschuberth@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.