From: Peter Krefting <peter@softwolves.pp.se>
To: Git Mailing List <git@vger.kernel.org>
Subject: cherry-pick very slow on big repository
Date: Fri, 10 Nov 2017 10:39:39 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.2.00.1711100959300.2391@ds9.cixit.se> (raw)
Hi!
On a big repository (57000 files, 2,5 gigabytes in .git/objects), git
cherry-pick is very slow for me (v2.15.0). This is cherry-picking a
one-file change, where the file is in the same place on both branches,
and which applies cleanly (I am backporting a few fixes to a
maintenance version):
$ time git cherry-pick -x 717eb328940ca2e33f14ed27576e656327854b7b
[redacted 391454f16d] Redacted
Author: Redacted <redacted>
Date: Mon Oct 16 15:58:05 2017 +0200
1 file changed, 2 insertions(+), 2 deletions(-)
real 6m9,054s
user 5m49,432s
sys 0m2,292s
Something is not how it should be here. The repo shares objects
(.git/objects/info/alternates) with another repository (I have run
"git gc" on both repositories).
Running strace, it seems like it is doing lstat(), open(), mmap(),
close() and munmap() on every single file in the repository, which
takes a lot of time.
I thought it was just updating the status, but "git status" returns
immediately, while cherry-picking takes several minutes for every
cherry-pick I do.
--
\\// Peter - http://www.softwolves.pp.se/
next reply other threads:[~2017-11-10 9:45 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-10 9:39 Peter Krefting [this message]
2017-11-10 10:20 ` cherry-pick very slow on big repository 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
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.1711100959300.2391@ds9.cixit.se \
--to=peter@softwolves.pp.se \
--cc=git@vger.kernel.org \
/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).