From: "Paweł Sikora" <pawel.sikora@agmk.net>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>, Dmitry Risenberg <dmitry.risenberg@gmail.com>
Subject: Re: cherry-pick is slow
Date: Tue, 15 May 2012 20:57:07 +0200 [thread overview]
Message-ID: <29715654.5ciT9KkCQq@localhost> (raw)
In-Reply-To: <20120515132451.GA25378@sigill.intra.peff.net>
On Tuesday 15 of May 2012 09:24:51 Jeff King wrote:
> [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.
i have two big repos (few GB) and cherry-pick utilizes i/o and cpu heavy.
timing varies from few seconds on raid-0 (2x500GB) to ~30 second
on linear lvm (few TB). here's perf report:
36,24% git libc-2.15.so [.] __memmove_ssse3_back
7,04% git libz.so.1.2.7 [.] inflate_fast
6,17% git libz.so.1.2.7 [.] inflate
5,53% git git [.] xdl_recs_cmp
3,04% git libc-2.15.so [.] __memcmp_sse4_1
2,54% git libz.so.1.2.7 [.] inflate_table
1,83% git libc-2.15.so [.] __strcmp_sse42
1,52% git libc-2.15.so [.] __memcpy_ssse3_back
1,49% git git [.] match_trees
1,39% git libc-2.15.so [.] _int_malloc
1,18% git libz.so.1.2.7 [.] adler32
1,08% git git [.] do_head_ref
1,02% git git [.] splice_tree
0,83% git libc-2.15.so [.] __strlen_sse2_pminub
0,71% git [kernel.kallsyms] [k] _raw_spin_lock
0,68% git git [.] shift_tree_by
0,67% git libc-2.15.so [.] _int_free
0,63% git [kernel.kallsyms] [k] __d_lookup_rcu
0,60% git [kernel.kallsyms] [k] link_path_walk
0,57% git git [.] get_shallow_commits
(...)
next prev parent reply other threads:[~2012-05-15 19:06 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
2012-05-15 18:57 ` Paweł Sikora [this message]
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=29715654.5ciT9KkCQq@localhost \
--to=pawel.sikora@agmk.net \
--cc=dmitry.risenberg@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).