Kevin Willford:
Since this is happening during a merge, you might need to use merge.renameLimit or the merge strategy option of -Xno-renames. Although the code does fallback to use the diff.renameLimit but there is still a lot that is done before even checking the rename limit so I would first try getting renames turned off.
That makes quite a large difference, with this setting it finishes in just a few seconds:
$ time git -c merge.renameLimit=1 cherry-pick -x 717eb328940ca2e33f14ed27576e656327854b7b [redacted 0576fbaf89] Redacted Author: Redacted <redacted> Date: Mon Oct 16 15:58:05 2017 +0200 1 file changed, 2 insertions(+), 2 deletions(-) real 0m15,473s user 0m14,904s sys 0m0,488s I'll add this setting for the repository for the future, thank you! -- \\// Peter - http://www.softwolves.pp.se/
