Jeff King:
Can you get a backtrace? I'd do something like:
Seems that it spends most time in diffcore_count_changes(), that is where it hits whenever I hit Ctrl+C (various line numbers 199-207 in diffcore-delta.c; this is on the v2.15.0 tag).
(gdb) bt #0 diffcore_count_changes (src=src@entry=0x55555db99970, dst=dst@entry=0x55555d6a4810, src_count_p=src_count_p@entry=0x55555db99998, dst_count_p=dst_count_p@entry=0x55555d6a4838, src_copied=src_copied@entry=0x7fffffffd3e0, literal_added=literal_added@entry=0x7fffffffd3f0) at diffcore-delta.c:203 #1 0x00005555556dee1a in estimate_similarity (minimum_score=30000, dst=0x55555d6a4810, src=0x55555db99970) at diffcore-rename.c:193 #2 diffcore_rename (options=options@entry=0x7fffffffd4f0) at diffcore-rename.c:560 #3 0x0000555555623d83 in diffcore_std ( options=options@entry=0x7fffffffd4f0) at diff.c:5846 #4 0x000055555564ab46 in get_renames (o=o@entry=0x7fffffffd850, tree=tree@entry=0x5555559d1b98, o_tree=o_tree@entry=0x5555559d1bc0, a_tree=a_tree@entry=0x5555559d1b98, b_tree=b_tree@entry=0x5555559d1b70, entries=entries@entry=0x555559351d20) at merge-recursive.c:554 #5 0x000055555564e7d9 in merge_trees (o=o@entry=0x7fffffffd850, head=head@entry=0x5555559d1b98, merge=<optimized out>, merge@entry=0x5555559d1b70, common=<optimized out>, common@entry=0x5555559d1bc0, result=result@entry=0x7fffffffd830) at merge-recursive.c:1985 #6 0x000055555569b2cc in do_recursive_merge (opts=0x7fffffffdf70, msgbuf=0x7fffffffd810, head=0x7fffffffd7f0, next_label=<optimized out>, base_label=<optimized out>, next=<optimized out>, base=0x5555559c1ba0) at sequencer.c:459 #7 do_pick_commit (command=TODO_PICK, commit=commit@entry=0x5555559c1b60, opts=opts@entry=0x7fffffffdf70, final_fixup=final_fixup@entry=0) at sequencer.c:1088 #8 0x000055555569e324 in single_pick (opts=0x7fffffffdf70, cmit=0x5555559c1b60) at sequencer.c:2306 #9 sequencer_pick_revisions (opts=0x7fffffffdf70) at sequencer.c:2355 #10 0x00005555555d4097 in run_sequencer (argc=1, argc@entry=3, argv=argv@entry=0x7fffffffe320, opts=<optimized out>, opts@entry=0x7fffffffdf70) at builtin/revert.c:200 #11 0x00005555555d449a in cmd_cherry_pick (argc=3, argv=0x7fffffffe320, prefix=<optimized out>) at builtin/revert.c:225 #12 0x0000555555567a38 in run_builtin (argv=<optimized out>, argc=<optimized out>, p=<optimized out>) at git.c:346 #13 handle_builtin (argc=3, argv=0x7fffffffe320) at git.c:554 #14 0x0000555555567cf6 in run_argv (argv=0x7fffffffe0e0, argcp=0x7fffffffe0ec) at git.c:606 #15 cmd_main (argc=<optimized out>, argv=<optimized out>) at git.c:683 #16 0x0000555555566e01 in main (argc=4, argv=0x7fffffffe318) at common-main.c:43 -- \\// Peter - http://www.softwolves.pp.se/