# Bug? git rebase -i --autostash fails to restore working files

3 messages from 2016-07-28 to 2016-07-28. Participants: Phillip Wood, Remi Galan Alfonso.
Thread: https://gitlist.dev/t/42946

## Phillip Wood, 2016-07-28 10:58

Subject: Bug? git rebase -i --autostash fails to restore working files
Message-ID: <222a3e5b-ff2c-799e-0fcb-cba23815019f@talktalk.net>
URL: https://gitlist.dev/e/222a3e5b-ff2c-799e-0fcb-cba23815019f%40talktalk.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

```

## Remi Galan Alfonso, 2016-07-28 13:02

Subject: Re: Bug? git rebase -i --autostash fails to restore working files
Message-ID: <568300231.1133609.1469710974063.JavaMail.zimbra@ensimag.grenoble-inp.fr>
URL: https://gitlist.dev/e/568300231.1133609.1469710974063.JavaMail.zimbra%40ensimag.grenoble-inp.fr
In-Reply-To: <222a3e5b-ff2c-799e-0fcb-cba23815019f@talktalk.net>

```
Hi Phillip,

Phillip Wood <phillip.wood@talktalk.net> writes:
> 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

[I'm happy to see rebase.missingCommitsCheck being used.]

> Could not execute editor
> 
> $ git rebase --abort
> No rebase in progress?

I remembered having read something about it recently and a quick
search confirmed it. It was corrected in commit 33ba9c6 (29/06/2016,
rebase -i: restore autostash on abort) that recently graduated to
master (on 19/07/2016 if I read the various "What's cooking"
correctly). So you will need to build git from source to have this
corrected.

> Best Wishes
> 
> Phillip

Thanks,
Rémi

```

## Phillip Wood, 2016-07-28 17:29

Subject: Re: Bug? git rebase -i --autostash fails to restore working files
Message-ID: <595ec1d8-a759-e2cf-b387-a68bd6c0a437@talktalk.net>
URL: https://gitlist.dev/e/595ec1d8-a759-e2cf-b387-a68bd6c0a437%40talktalk.net
In-Reply-To: <568300231.1133609.1469710974063.JavaMail.zimbra@ensimag.grenoble-inp.fr>

```
On 28/07/16 14:02, Remi Galan Alfonso wrote:
> Hi Phillip,
> 
> Phillip Wood <phillip.wood@talktalk.net> writes:
>> 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
> 
> [I'm happy to see rebase.missingCommitsCheck being used.]
> 
>> Could not execute editor
>>
>> $ git rebase --abort
>> No rebase in progress?
> 
> I remembered having read something about it recently and a quick
> search confirmed it. It was corrected in commit 33ba9c6 (29/06/2016,
> rebase -i: restore autostash on abort) that recently graduated to
> master (on 19/07/2016 if I read the various "What's cooking"
> correctly). So you will need to build git from source to have this
> corrected.

Hi Rémi

Thanks for the reply, it's good to know it's been fixed.

Best Wishes

Phillip


```