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

Re: cherry-pick is slow

From
Jeff King <peff@peff.net>
Date
May 14, 2012, 14:54 UTC
Message-ID
<20120514145412.GA1159@sigill.intra.peff.net>
In-Reply-To
<CAPZ_ugbV6hB+8z8UsQKdHhxGuHbLzC5WK19mK7M8k2tMz+mtXw@mail.gmail.com>
On Sun, May 13, 2012 at 07:39:49PM +0400, Dmitry Risenberg wrote:
> However, cherry-picking is still not as fast as I expected it to be -
> cherry-picking a single-file commit takes about 14-15 seconds, fully
> using one CPU core. Anything else I can improve?

It's probably detecting renames as part of the merge, which can be expensive if the thing you are cherry-picking is far away from HEAD. You can try setting the merge.renamelimit config variable to something small (like 1; setting it to 0 means "no limit").

-Peff
Previous: Dmitry RisenbergNext: Jeff King
Message 4 of 9 in “cherry-pick is slow”
  1. Dmitry RisenbergMay 12, 2012
  2. Junio C HamanoMay 13, 2012
  3. Dmitry RisenbergMay 13, 2012
  4. Jeff KingMay 14, 2012
  5. Jeff KingMay 15, 2012
  6. Paweł SikoraMay 15, 2012
  7. Junio C HamanoMay 15, 2012
  8. Junio C HamanoMay 15, 2012
  9. Jeff KingMay 19, 2012

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.