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

Re: [PATCH 1/3] cherry-pick: handle root commits with external strategies

From
Sebastian Schuberth <sschuberth@gmail.com>
Date
May 12, 2011, 14:50 UTC
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:
Show 10 quoted lines
> 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
Previous: Jeff KingNext: Jeff King
Message 5 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.