[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:
quoted
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
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:
quoted
quoted
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
(...)