From: Peter Krefting <peter@softwolves.pp.se>
To: Kevin Willford <kewillf@microsoft.com>
Cc: Derrick Stolee <stolee@gmail.com>, Jeff King <peff@peff.net>,
Git Mailing List <git@vger.kernel.org>
Subject: RE: cherry-pick very slow on big repository
Date: Mon, 13 Nov 2017 12:19:00 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.2.00.1711131217010.22867@ds9.cixit.se> (raw)
In-Reply-To: <CY4PR21MB0855CA8ABB6BE4F176902F36B7540@CY4PR21MB0855.namprd21.prod.outlook.com>
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/
next prev parent reply other threads:[~2017-11-13 11:19 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-10 9:39 cherry-pick very slow on big repository Peter Krefting
2017-11-10 10:20 ` Jeff King
2017-11-10 12:37 ` Peter Krefting
2017-11-10 12:59 ` Derrick Stolee
2017-11-10 14:05 ` Peter Krefting
2017-11-10 17:04 ` Kevin Willford
2017-11-13 11:19 ` Peter Krefting [this message]
2017-11-10 17:37 ` Elijah Newren
2017-11-10 23:32 ` Elijah Newren
2017-11-13 11:22 ` Peter Krefting
2017-11-13 18:09 ` Elijah Newren
2017-11-21 12:07 ` Peter Krefting
2017-11-21 17:14 ` Elijah Newren
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.00.1711131217010.22867@ds9.cixit.se \
--to=peter@softwolves.pp.se \
--cc=git@vger.kernel.org \
--cc=kewillf@microsoft.com \
--cc=peff@peff.net \
--cc=stolee@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).