From: Sebastian Schuberth <sschuberth@gmail.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/3] cherry-pick: handle root commits with external strategies
Date: Thu, 12 May 2011 16:50:11 +0200 [thread overview]
Message-ID: <BANLkTinyLeTL=-rUPEZOQapudWCR_Lbh4w@mail.gmail.com> (raw)
In-Reply-To: <20110512110946.GA5292@sigill.intra.peff.net>
On Thu, May 12, 2011 at 13:09, Jeff King <peff@peff.net> wrote:
> The merge-recursive strategy already handles root commits;
> it cherry-picks the difference between the empty tree and
> the root commit's tree.
>
> However, for external strategies, we dereference NULL and
> segfault while building the argument list. Instead, let's
> handle this by passing the empty tree sha1 to the merge
> script.
>
> Signed-off-by: Jeff King <peff@peff.net>
Works perfectly for me, thanks a lot for coming up with a patch incredibly fast!
--
Sebastian Schuberth
next prev parent reply other threads:[~2011-05-12 14:50 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-12 10:15 git cherry-pick --strategy=resolve segfaults if picking a root commit Sebastian Schuberth
2011-05-12 10:45 ` 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 [this message]
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='BANLkTinyLeTL=-rUPEZOQapudWCR_Lbh4w@mail.gmail.com' \
--to=sschuberth@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).