From: "Shawn O. Pearce" <spearce@spearce.org>
To: Erez Zadok <ezk@cs.sunysb.edu>
Cc: git@vger.kernel.org
Subject: Re: very slow cherry-pick'ing (old-2.6-bkcvs tree)
Date: Fri, 7 Sep 2007 00:42:23 -0400 [thread overview]
Message-ID: <20070907044223.GW18160@spearce.org> (raw)
In-Reply-To: <200709062351.l86NpnAK004807@agora.fsl.cs.sunysb.edu>
Erez Zadok <ezk@cs.sunysb.edu> wrote:
> Our group maintains Unionfs on the latest -rc kernel, but we also maintain
> several backports going all the way to 2.6.9. Once we complete the
> development and testing of a feature/fix in -latest, we cherry-pick those
> commits to older backports, and test those. When I cherry-pick from -latest
> to my 2.6.{22,21,20,19,18} repositories, it works reasonably fast. But when
> I cherry-pick to my 2.6.9 tree, it runs about 20 times slower! Why? Is
> there anything I can do to inspect what's going on and perhaps speed up the
> cherry-picking process?
I'm guessing its due to rename detection.
git-cherry-pick is implemented in terms of git-merge-recursive,
which always does rename detection when files are deleted or added.
This can take some considerable time if there's a lot of files that
have been added/deleted.
What would probably be faster would be to dump the patches in
question using git-format-patch and then apply them using git-am.
This bypasses the rename detection as it is using strictly a diff
and an apply.
--
Shawn.
next prev parent reply other threads:[~2007-09-07 4:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-06 23:51 very slow cherry-pick'ing (old-2.6-bkcvs tree) Erez Zadok
2007-09-07 4:42 ` Shawn O. Pearce [this message]
2007-09-07 7:27 ` Johannes Sixt
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=20070907044223.GW18160@spearce.org \
--to=spearce@spearce.org \
--cc=ezk@cs.sunysb.edu \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.