From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: git@vger.kernel.org
Cc: entwicklung@pengutronix.de
Subject: time needed to rebase shortend by using --onto?
Date: Wed, 26 May 2021 12:09:32 +0200 [thread overview]
Message-ID: <20210526100932.2hw4rbazgvd6mzff@pengutronix.de> (raw)
[-- Attachment #1: Type: text/plain, Size: 1965 bytes --]
Hello,
I have a kernel topic branch containing 4 patches on top of Linux v5.4.
(I didn't speak to the affected customer, so I cannot easily share the
patch stack. If need be I can probably anonymize it or ask if I can
publish the patches.)
It rebases clean on v5.10:
$ time git rebase v5.10
Performing inexact rename detection: 100% (36806539/36806539), done.
Performing inexact rename detection: 100% (36806539/36806539), done.
Performing inexact rename detection: 100% (36806539/36806539), done.
Performing inexact rename detection: 100% (36806539/36806539), done.
Successfully rebased and updated detached HEAD.
real 3m47.841s
user 1m25.706s
sys 0m11.181s
If I start with the same rev checked out and explicitly specify the
merge base, the rebase process is considerably faster:
$ time git rebase --onto v5.10 v5.4
Performing inexact rename detection: 100% (36806539/36806539), done.
Performing inexact rename detection: 100% (36806539/36806539), done.
Performing inexact rename detection: 100% (36806539/36806539), done.
Performing inexact rename detection: 100% (36806539/36806539), done.
Successfully rebased and updated detached HEAD.
real 1m20.588s
user 1m12.645s
sys 0m6.733s
Is there some relevant complexity in the first invocation I'm not seeing
that explains it takes more than the double time? I would have expected
that
git rebase v5.10
does the same as:
git rebase --onto v5.10 $(git merge-base HEAD v5.10)
. (FTR:
$ time git merge-base HEAD v5.10
219d54332a09e8d8741c1e1982f5eae56099de85
real 0m0.158s
user 0m0.105s
sys 0m0.052s
, 219d5433 is v5.4 as expected.
$ git version
git version 2.29.2
That's from the Debian package 1:2.29.2-1~bpo10+1 on a Debian 10 box.)
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | https://www.pengutronix.de/ |
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-05-26 10:09 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-26 10:09 Uwe Kleine-König [this message]
2021-05-26 11:04 ` time needed to rebase shortend by using --onto? Bagas Sanjaya
2021-05-26 14:38 ` Elijah Newren
2021-05-27 21:59 ` Uwe Kleine-König
2021-05-27 22:15 ` Uwe Kleine-König
2021-05-28 5:38 ` Elijah Newren
2021-05-27 23:08 ` Elijah Newren
2021-05-28 21:40 ` Uwe Kleine-König
2021-05-28 22:26 ` Elijah Newren
2021-05-29 16:59 ` Felipe Contreras
2021-05-26 22:18 ` Junio C Hamano
2021-05-27 22:16 ` Uwe Kleine-König
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210526100932.2hw4rbazgvd6mzff@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=entwicklung@pengutronix.de \
--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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.