threads / bug / 36695

bug: autostash is lost after aborted rebase

Subject: bug: autostash is lost after aborted rebase

## tl;dr

6 messages between May 19, 2014 and May 16, 2016.

replies: 5people: 6as markdown or json

Karen Etheridge· May 19, 2014, 00:57 UTC · lore

scenario: 
- edit some tracked files; do not add them to the index
- "git config rebase.autostash true"
- "git rebase -i HEAD~3" (an autostash will be created)
- delete the entire buffer and save/exit the editor - this will abort the
  rebase

poof, the autostash is gone (it is not reapplied) -- it must be explicitly applied again via the SHA that was printed earlier.

(please cc me; I am not subscribed to the list.)

Felipe Contreras· May 19, 2014, 01:38 UTC · re: Karen Etheridge · lore

RE: bug: autostash is lost after aborted rebase

Karen Etheridge wrote:

Show 10 quoted lines

> 
> scenario: 
> - edit some tracked files; do not add them to the index
> - "git config rebase.autostash true"
> - "git rebase -i HEAD~3" (an autostash will be created)
> - delete the entire buffer and save/exit the editor - this will abort the
>   rebase
> 
> poof, the autostash is gone (it is not reapplied) -- it must be explicitly
> applied again via the SHA that was printed earlier.

Yeah, I noticed this issue while rewriting `git rebase` in Ruby. I also noticed many other issues and inconsistencies that happen depending on what arguments you pass to `git rebase`.

I'm in the process of writing a much more improved and consistent `git rebase` in Ruby with a different interface. Sadly it's still not ready.

> (please cc me; I am not subscribed to the list.)

No need to say that, only on mailing lists that do Reply-To munging, and Git is not one of them.

Cheers.

-- 
Felipe Contreras

Matthieu Moy· May 19, 2014, 09:16 UTC · re: Karen Etheridge · lore

Re: bug: autostash is lost after aborted rebase

[ Cc-ing Ramkumar ]

Karen Etheridge <ether@cpan.org> writes:

Show 9 quoted lines

> scenario: 
> - edit some tracked files; do not add them to the index
> - "git config rebase.autostash true"
> - "git rebase -i HEAD~3" (an autostash will be created)
> - delete the entire buffer and save/exit the editor - this will abort the
>   rebase
>
> poof, the autostash is gone (it is not reapplied) -- it must be explicitly
> applied again via the SHA that was printed earlier.

Indeed. Confirmed, even with pu (I thought I remembered seeing a fix on the list, but I must have mixed up with something else).

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

Junio C Hamano· May 20, 2014, 17:34 UTC · re: Matthieu Moy · lore

Re: bug: autostash is lost after aborted rebase

Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:

Show 16 quoted lines

> [ Cc-ing Ramkumar ]
>
> Karen Etheridge <ether@cpan.org> writes:
>
>> scenario: 
>> - edit some tracked files; do not add them to the index
>> - "git config rebase.autostash true"
>> - "git rebase -i HEAD~3" (an autostash will be created)
>> - delete the entire buffer and save/exit the editor - this will abort the
>>   rebase
>>
>> poof, the autostash is gone (it is not reapplied) -- it must be explicitly
>> applied again via the SHA that was printed earlier.
>
> Indeed. Confirmed, even with pu (I thought I remembered seeing a fix on
> the list, but I must have mixed up with something else).

Thanks. I see Ram's patch to address this on the list. Will pick it up and queue for post-release, as this is a fairly old breakage dating as far back as v1.8.4, if I am not mistaken.

Eugene Yarmash· May 16, 2016, 21:23 UTC · re: Junio C Hamano · lore

Re: bug: autostash is lost after aborted rebase

The bug still persists when you abort the rebase by using :cq in Vim (exit with an error code). See also http://stackoverflow.com/q/37252108/244297

-- View this message in context: http://git.661346.n2.nabble.com/bug-autostash-is-lost-after-aborted-rebase-tp7611141p7656556.html Sent from the git mailing list archive at Nabble.com.

Philippe Vaucher· May 19, 2014, 07:40 UTC · lore

Re: bug: autostash is lost after aborted rebase

Show 9 quoted lines

> scenario:
> - edit some tracked files; do not add them to the index
> - "git config rebase.autostash true"
> - "git rebase -i HEAD~3" (an autostash will be created)
> - delete the entire buffer and save/exit the editor - this will abort the
>   rebase
>
> poof, the autostash is gone (it is not reapplied) -- it must be explicitly
> applied again via the SHA that was printed earlier.

Yes, I hit this often and it's annoying in "sausage making" workflows. Thanks for reporting this issue, I don't know why I didn't think of reporting it myself :) It likely affects a large portion of the users who like to set `rebase.autostash` and rebase.autosquash` in their config, but for some reason they didn't think of reporting it either.

Philippe