interrupting "git rebase" (Re: git rebase +)
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Oct 14, 2011, 05:26 UTC
- Message-ID
- <20111014052653.GA5052@elie.hsd1.il.comcast.net>
- In-Reply-To
- <4E96E5E1.7010103@viscovery.net>
Johannes Sixt wrote:
> Hitting Ctrl-C during git-rebase results undefined behavior. git-rebase is > a shell script and was never designed to operate in any form of atomicity. > > You should have let it run until it stopped.
Wait, really? That's bad, and unlike most git commands.
> Then you could have said 'git > rebase --abort' (if it didn't complete) or 'git reset --hard ORIG_HEAD' > (if it completed).
If interrupting the rebase leaves the repository in a state that
rm -fr .git/rebase-apply git reset --hard <appropriate commit name>
cannot recover from, I'd consider it a serious problem.
By the way, what happened to the "git rebase --abort-softly" synonym for "rm -fr .git/rebase-apply" discussed a while ago?