From: Sebastian Schuberth <sschuberth@gmail.com>
Date: Thu, 12 May 2011 14:50:11 GMT
Subject: Re: [PATCH 1/3] cherry-pick: handle root commits with external strategies
Message-ID: <BANLkTinyLeTL=-rUPEZOQapudWCR_Lbh4w@mail.gmail.com>
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