From: Jeff King <peff@peff.net>
To: Johannes Sixt <j6t@kdbg.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Eugene Sajine <euguess@gmail.com>,
git@vger.kernel.org
Subject: Re: [BUG] - git rebase -i performs rebase when it shouldn't?
Date: Sun, 11 Apr 2010 21:01:23 -0400 [thread overview]
Message-ID: <20100412010123.GA11051@coredump.intra.peff.net> (raw)
In-Reply-To: <201004111954.38156.j6t@kdbg.org>
On Sun, Apr 11, 2010 at 07:54:37PM +0200, Johannes Sixt wrote:
> On Sonntag, 11. April 2010, Jeff King wrote:
> > Good point. Originally, we did the rebase directly on the branch, though
> > I'm not sure if we did "checkout $branch && reset $onto" or "branch -f
> > $branch $onto && checkout $branch". These days we operate on a detached
> > HEAD, and we seem to "checkout $onto^0", which should do the
> > optimization you mention.
>
> But before this "checkout $onto^0" happens, some (all?) variants still
> do "checkout topic && rev-list upstream..HEAD" instead of just "rev-list
> upstream..topic".
I don't think this is the case any longer for regular rebase, from my
reading of the code and doing a rebase under GIT_TRACE. Grepping the
history turns up 0cb0664 (rebase [--onto O] A B: omit needless checkout,
2008-03-15).
But doing an interactive rebase under GIT_TRACE, it looks like it still
does the unnecessary checkout.
-Peff
next prev parent reply other threads:[~2010-04-12 1:02 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-09 19:35 [BUG] - git rebase -i performs rebase when it shouldn't? Eugene Sajine
2010-04-10 4:26 ` Jeff King
2010-04-10 4:39 ` Junio C Hamano
2010-04-10 4:47 ` Jeff King
2010-04-10 19:58 ` Johannes Sixt
2010-04-11 10:15 ` Jeff King
2010-04-11 17:54 ` Johannes Sixt
2010-04-12 1:01 ` Jeff King [this message]
2010-04-12 10:50 ` Michal Vitecek
2010-04-12 17:39 ` Johannes Sixt
2010-04-10 22:10 ` Eugene Sajine
2010-04-11 10:22 ` Jeff King
2010-04-11 14:06 ` Eugene Sajine
2010-04-12 14:09 ` Eugene Sajine
2010-04-12 15:13 ` Johannes Sixt
2010-04-12 15:28 ` Eugene Sajine
2010-04-12 15:47 ` Johannes Sixt
2010-04-13 16:30 ` Eugene Sajine
2010-04-14 6:08 ` Johannes Sixt
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=20100412010123.GA11051@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=euguess@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.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 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).