From: Elijah Newren <newren@gmail.com>
To: Peter Krefting <peter@softwolves.pp.se>
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: Fri, 10 Nov 2017 09:37:59 -0800 [thread overview]
Message-ID: <CABPp-BH4LLzeJjE5cvwWQJ8xTj3m9oC-41Tu8BM8c7R0gQTjWw@mail.gmail.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1711101436270.2391@ds9.cixit.se>
Interesting timing. I have some performance patches specifically
developed because rename detection during merges made a small
cherry-pick in a large repo rather slow...in my case, I dropped the
time for the cherry pick by a factor of about 30 (no guarantees you'll
see the same; it's very history-specific). I was just about to start
sending my three series of patches, the performance one being the
third...
On Fri, Nov 10, 2017 at 6:05 AM, Peter Krefting <peter@softwolves.pp.se> wrote:
> Derrick Stolee:
>
>> Git is spending time detecting renames, which implies you probably renamed
>> a folder or added and deleted a large number of files. This rename detection
>> is quadratic (# adds times # deletes).
>
>
> Yes, a couple of directories with a lot of template files have been renamed
> (and some removed, some added) between the current development branch and
> this old maintenance branch. I get the "Performing inexact rename detection"
> a lot when merging changes in the other direction.
>
> However, none of them applies to these particular commits, which only
> touches files that are in the exact same location on both branches.
>
>> You can remove this rename detection by running your cherry-pick with `git
>> -c diff.renameLimit=1 cherry-pick ...`
>
>
> That didn't work, actually it failed to finish with this setting in effect,
> it hangs in such a way that I can't stop it with Ctrl+C (neither when
> running from the command line, nor when running inside gdb). It didn't
> finish in the 20 minutes I gave it.
>
> I also tried with diff.renames=false, which also seemed to fail.
>
>
> --
> \\// Peter - http://www.softwolves.pp.se/
next prev parent reply other threads:[~2017-11-10 17:38 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
2017-11-10 17:37 ` Elijah Newren [this message]
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=CABPp-BH4LLzeJjE5cvwWQJ8xTj3m9oC-41Tu8BM8c7R0gQTjWw@mail.gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=peter@softwolves.pp.se \
--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).