From: Thomas Rast <trast@inf.ethz.ch>
To: Junio C Hamano <gitster@pobox.com>
Cc: Shezan Baig <shezbaig.wk@gmail.com>,
Thomas Rast <trast@student.ethz.ch>, <git@vger.kernel.org>,
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Subject: Re: [PATCH] rebase -i: avoid checking out $branch when possible
Date: Fri, 18 May 2012 10:27:53 +0200 [thread overview]
Message-ID: <87obplhp12.fsf@thomas.inf.ethz.ch> (raw)
In-Reply-To: 7vwr4de5j8.fsf@alter.siamese.dyndns.org
Junio C Hamano <gitster@pobox.com> writes:
> Shezan Baig <shezbaig.wk@gmail.com> writes:
>
>> Just wondering if this patch is going to be available in an upcoming
>> version of git?
>
> As we can see from the exchange you quoted, I do not think we have nailed
> the details of desired behaviour in the updated code down.
>
> Thomas, how would you want to proceed?
Hrm. You wrote:
> The discrepancy in the "abort" case may come only in the three cases:
>
> - EDITOR is pointing at something funny, [let's do the checkout to be
> safe for scripts]
Agreed.
> - The user told us not to do the rebase by making insn sheet empty. In
> other words, this is "aborting the entire rebase", so ideally it
> should come back to the state before the user ran "git rebase"
> command (i.e. where she was before we switched to <branch>).
>
> I do not think this ideal behaviour is something neither batch or
> interactive rebase has traditionally implemented, but I can see how
> we can sell this as a bugfix to the end users.
That's a convincing argument, so let's make it so.
> - It turns out that everything is already contained and there is
> nothing to apply, i.e. after this sequence:
>
> git checkout branch
> git checkout $onto_or_merge_base_between_base_and_branch
>
> we find out that "git cherry $onto_or_merge_base branch" is empty.
Is there a command missing here? This alone does not make them the
same, perhaps you meant some resetting.
I'll assume that you meant a case where the user is *not* on branch, but
base/onto is an ancestor of the branch, e.g., in a sequence
git checkout base
git reset --hard branch~5
# now branch..base is empty
git rebase base branch
the rebase will not do anything unless forced. Similarly for the case
where base==branch. And then
> Because you will be one commit ahead of $onto_or_merge_base if "git
> cherry" were to give one commit to be replayed, I think it is
> logically correct if you stayed at the $onto_or_merge_base without
> checking out <branch>. In other words, abort-with-checkout is not
> ideal for this case; we would want to just abort in this case.
This would be hard to sell, because a script that runs
git rebase base branch
could reasonably assume that after the rebase, the current branch is
'branch', unless some error occurred. And we'd be breaking that.
Or am I missing the point of your reasoning?
--
Thomas Rast
trast@{inf,student}.ethz.ch
next prev parent reply other threads:[~2012-05-18 8:29 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-20 15:05 [PATCH] rebase -i: avoid checking out $branch when possible Thomas Rast
2012-04-20 15:52 ` Junio C Hamano
2012-04-20 16:01 ` Thomas Rast
2012-04-20 20:06 ` Junio C Hamano
2012-05-15 16:26 ` Shezan Baig
2012-05-15 17:08 ` Junio C Hamano
2012-05-18 8:27 ` Thomas Rast [this message]
2012-05-18 15:25 ` Junio C Hamano
2012-04-20 16:45 ` 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
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=87obplhp12.fsf@thomas.inf.ethz.ch \
--to=trast@inf.ethz.ch \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.von.zweigbergk@gmail.com \
--cc=shezbaig.wk@gmail.com \
--cc=trast@student.ethz.ch \
/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).