Re: git rebase --abort of an --onto run does not checkout the originating branch

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 22, 2010, 19:15 UTC
Message-ID: <7vlj5qkpjc.fsf@alter.siamese.dyndns.org>
In-Reply-To: <4CC1C34E.8090203@workspacewhiz.com>

Joshua Jensen <jjensen@workspacewhiz.com> writes:

Show 11 quoted lines

> git rebase --onto mybranch START_SHA END_SHA
>
> In the middle, I decide to run 'git rebase --abort'.
>
> Just as the documentation states, it performs a checkout of END_SHA as
> the restored branch.  END_SHA has nothing to do with the originating
> branch, and confusion ensues.
>
> Is there a reason why 'git rebase' should not store off the
> originating branch and use that for an --abort, instead of <branch>
> which is END_SHA?

When END_SHA is an actual branch name (which by the way is almost always how I use --onto in my attempts to transplant my topics), and when I found out that the conflicts I see while rebasing the topic to a different starting point (i.e. --onto) is too much to handle for too little gain, I would not appreciate if --abort took me to the --onto branch, which is totally uninteresting for the purpose of what I was attempting to do, namely, to deal with the topic.

If the command took me back to the tip of the topic that I failed to rebase, I can continue attempting to whip it in shape using different strategies from there (e.g. merging an older part of upstream into the topic before merging the topic back to the upstream).