From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 Apr 2012 15:52:06 GMT
Subject: Re: [PATCH] rebase -i: avoid checking out $branch when possible
Message-ID: <xmqqwr5atn89.fsf@junio.mtv.corp.google.com>
In-Reply-To: <fee3225e29915e1b61e29a5d2fe37db20fa4b596.1334933837.git.trast@student.ethz.ch>

Thomas Rast <trast@student.ethz.ch> writes:

> I was a bit torn on whether I should abort with checkout, or without
> it.  The manual clearly states that rebase "will perform an automatic
> git checkout <branch> before doing anything else", which mandates at
> least *trying* the checkout in the error path, hence this version.
>
> However, in contrived cases this can lead to strange behavior.  For
> example, a checkout conflict with a file in the worktree may prevent
> the abort path from working correctly, even though going through with
> the rebase itself may succeed.

Given all that contortion, is it even worth doing this?