From: Alban Gruin <alban.gruin@gmail.com> To: Junio C Hamano <gitster@pobox.com> Cc: "SZEDER Gábor" <szeder.dev@gmail.com>, git@vger.kernel.org, "Elijah Newren" <newren@gmail.com>, "Ævar Arnfjörð" <avarab@gmail.com>, "Eugeniu Rosca" <erosca@de.adit-jv.com>, "Jeff King" <peff@peff.net>, "Eugeniu Rosca" <roscaeugeniu@gmail.com> Subject: Re: [PATCH v1] rebase -i: stop checking out the tip of the branch to rebase Date: Fri, 24 Jan 2020 15:45:11 +0100 [thread overview] Message-ID: <4142ab55-3311-4be2-2173-5cdacafb17f3@gmail.com> (raw) In-Reply-To: <xmqq5zh36wx1.fsf@gitster-ct.c.googlers.com> Hi Junio, Le 22/01/2020 à 21:47, Junio C Hamano a écrit : > Alban Gruin <alban.gruin@gmail.com> writes: > >> One of the first things done by the interactive rebase is to make a todo >> list. This requires knowledge of the commit range to rebase. To get >> the oid of the last commit of the range, the tip of the branch to rebase >> is checked out with prepare_branch_to_be_rebased(), then the oid of the >> HEAD is read. On big repositories, it's a performance penalty: the user >> may have to wait before editing the todo list while git is extracting the >> branch silently (because git-checkout is silenced here). After this, >> the head of the branch is not even modified. > > Hmph. One curious thing in the above is why this is specific to > "rebase -i". The need to know the commit range to rebase is shared > across any rebase backend, and it would be the most natural to parse > the optional second argument (i.e. the branch or the commit to > rebase) before builtin/rebase.c dispatches to a specific rebase > backend, wouldn't it? So, the question is why a normal "rebase" > does not need the same fix? > That's a problem shared by all rebases using the sequencer, so -m and -r are also affected by this. `am' is not. > If the answer is "rebase in general was fine without extra checkout, > but 'rebase -i' was doing an unnecessary checkout" (or any other > answer) that is something that would help future readers to record > in the commit log message. > So yes, the answer is that the am backend does not perform this checkout, unlike all others rebases. I will resend this patch very soon. > Thanks. > > Cheers, Alban
next prev parent reply other threads:[~2020-01-24 14:45 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-01-08 21:43 Unreliable 'git rebase --onto' Eugeniu Rosca 2020-01-08 22:35 ` SZEDER Gábor 2020-01-09 0:55 ` Elijah Newren 2020-01-09 15:03 ` SZEDER Gábor 2020-01-09 17:53 ` Elijah Newren 2020-01-21 19:18 ` [PATCH v1] rebase -i: stop checking out the tip of the branch to rebase Alban Gruin 2020-01-21 20:07 ` Elijah Newren 2020-01-22 20:24 ` Junio C Hamano 2020-01-22 20:47 ` Junio C Hamano 2020-01-24 14:45 ` Alban Gruin [this message] 2020-01-24 14:45 ` [PATCH v2] " Alban Gruin 2020-01-24 14:55 ` Alban Gruin 2020-01-24 18:12 ` Junio C Hamano 2020-01-24 15:05 ` [PATCH v3] " Alban Gruin 2020-01-24 18:30 ` Junio C Hamano 2020-02-05 14:31 ` Johannes Schindelin 2020-01-24 17:11 ` [PATCH v2] " Andrei Rybak 2020-01-09 11:13 ` Unreliable 'git rebase --onto' Eugeniu Rosca [not found] ` <CABPp-BHsyMOz+hi7EYoAnAWfzms7FRfwqCoarnu8H+vyDoN6SQ@mail.gmail.com> 2020-01-09 10:53 ` Eugeniu Rosca 2020-01-09 18:05 ` Elijah Newren 2020-01-10 0:06 ` Eugeniu Rosca 2020-01-10 2:35 ` 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 * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=4142ab55-3311-4be2-2173-5cdacafb17f3@gmail.com \ --to=alban.gruin@gmail.com \ --cc=avarab@gmail.com \ --cc=erosca@de.adit-jv.com \ --cc=git@vger.kernel.org \ --cc=gitster@pobox.com \ --cc=newren@gmail.com \ --cc=peff@peff.net \ --cc=roscaeugeniu@gmail.com \ --cc=szeder.dev@gmail.com \ --subject='Re: [PATCH v1] rebase -i: stop checking out the tip of the branch to rebase' \ /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
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 NNTP newsgroup(s).