Bug? git rebase -i --autostash fails to restore working files
- From
- Phillip Wood <phillip.wood@talktalk.net>
- Date
- Jul 28, 2016, 10:58 UTC
- Message-ID
- <222a3e5b-ff2c-799e-0fcb-cba23815019f@talktalk.net>
When running ‘git rebase -i --autostash’ if the editor fails then the rebase fails but stash is not applied so the working files are not restored. Running ‘git rebase --abort’ replies that there’s no rebase in progress. If you notice what’s happened it’s not a problem if you know to do ‘git stash apply <autostash id>’ but it’s confusing as normally the stash would be automatically applied. This happened to me when I messed up my editor configuration but you can reproduce it with
$ GIT_SEQUENCE_EDITOR=false git rebase -i --autostash HEAD^^ Created autostash: ff960d4 HEAD is now at f1b8af7 [git] Turn on rebase.missingCommitsCheck Could not execute editor
$ git rebase --abort No rebase in progress?
Best Wishes
Phillip