git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Dmitry Risenberg <dmitry.risenberg@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: cherry-pick is slow
Date: Tue, 15 May 2012 09:24:51 -0400	[thread overview]
Message-ID: <20120515132451.GA25378@sigill.intra.peff.net> (raw)
In-Reply-To: <CAPZ_ugbD=mOPBs6GyapWtv6NWuJ-=r2+bqBN9n+gdTPwGj3F0Q@mail.gmail.com>

[let's keep this on-list so others can benefit from the discussion]

On Tue, May 15, 2012 at 12:38:59PM +0400, Dmitry Risenberg wrote:

> > 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").
> 
> I set it to 1, but it didn't help at all - cherry-pick time is still
> about the same.

OK, then my guess was probably wrong. You'll have to try profiling (if
you are on Linux, "perf record git cherry-pick ..."; perf report" is the
simplest way). Or if the repository is publicly available, I can do a
quick profile run.

-Peff

  parent reply	other threads:[~2012-05-15 13:25 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-12 22:39 cherry-pick is slow Dmitry Risenberg
2012-05-13  1:11 ` Junio C Hamano
2012-05-13 15:39   ` Dmitry Risenberg
2012-05-14 14:54     ` Jeff King
     [not found]       ` <CAPZ_ugbD=mOPBs6GyapWtv6NWuJ-=r2+bqBN9n+gdTPwGj3F0Q@mail.gmail.com>
2012-05-15 13:24         ` Jeff King [this message]
2012-05-15 18:57           ` Paweł Sikora
2012-05-15 20:32           ` Junio C Hamano
2012-05-15 21:03             ` Junio C Hamano
2012-05-19  0:54               ` Jeff King

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=20120515132451.GA25378@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=dmitry.risenberg@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 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).