From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Sixt <j.sixt@viscovery.net>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] rebase --interactive: Compute upstream SHA1 before switching branches
Date: Tue, 3 Jun 2008 14:55:22 +0100 (BST) [thread overview]
Message-ID: <alpine.DEB.1.00.0806031454350.13507@racer.site.net> (raw)
In-Reply-To: <7vbq2j5k0u.fsf@gitster.siamese.dyndns.org>
Hi,
On Mon, 2 Jun 2008, Junio C Hamano wrote:
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> >> BTW, methinks, this checkout is unnecessary, since before the rebase
> >> begins, there is a 'git checkout $ONTO', and the branch switching is
> >> certainly not needed to compute the todo list...
> >
> > It is needed to determine which branch to update after finish.
>
> I'll apply Hannes's patch for now as I do not want to leave an obvious fix
> out of -rc1.
>
> I think Hannes is referring to the same issue as the one dealt with with
> 0cb0664 (rebase [--onto O] A B: omit needless checkout, 2008-03-15) for
> the non-interactive codepath.
>
> You certainly "need to determine which branch to update after finish",
> and you do need to remember what branch you were on (if you were not
> called with the <branch> parameter), or what branch were given from the
> command line (if you got one as <branch> parameter) in order to do so,
> but the way to remember these values does not have to involve an extra
> checkout.
>
> By doing an extra checkout of "the original HEAD", before switching to a
> detached HEAD state at the $ONTO commit to "clean the slate" to apply
> the sequence on top, more work tree entries will be smudged, forcinging
> more recompilations than necessary if the tracked contents are "source"
> files.
Right. I failed to follow the given hint to the other commit, but it
makes perfect sense now.
Thanks,
Dscho
prev parent reply other threads:[~2008-06-03 13:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-02 14:01 [PATCH] rebase --interactive: Compute upstream SHA1 before switching branches Johannes Sixt
2008-06-02 15:29 ` Johannes Schindelin
2008-06-03 2:28 ` Junio C Hamano
2008-06-03 13:55 ` Johannes Schindelin [this message]
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.1.00.0806031454350.13507@racer.site.net \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
/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).