# bug: autostash is lost after aborted rebase 6 messages from 2014-05-19 to 2016-05-16. Participants: Karen Etheridge, Felipe Contreras, Philippe Vaucher, Matthieu Moy, Junio C Hamano, Eugene Yarmash. Thread: https://gitlist.dev/t/36695 ## Karen Etheridge, 2014-05-19 00:57 Subject: bug: autostash is lost after aborted rebase Message-ID: <20140519005719.GB38299@tequila> URL: https://gitlist.dev/e/20140519005719.GB38299%40tequila ``` 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, 2014-05-19 01:38 Subject: RE: bug: autostash is lost after aborted rebase Message-ID: <537960a5f0d95_10da88d308b6@nysa.notmuch> URL: https://gitlist.dev/e/537960a5f0d95_10da88d308b6%40nysa.notmuch In-Reply-To: <20140519005719.GB38299@tequila> ``` Karen Etheridge wrote: > > 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 ``` ## Philippe Vaucher, 2014-05-19 07:40 Subject: Re: bug: autostash is lost after aborted rebase Message-ID: URL: https://gitlist.dev/e/CAGK7Mr6nMD5Q9ptvuWk9BRKwhEhtRdANSC5G%3Dm3%3D2V2HgJYG4g%40mail.gmail.com In-Reply-To: ``` > 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 ``` ## Matthieu Moy, 2014-05-19 09:16 Subject: Re: bug: autostash is lost after aborted rebase Message-ID: URL: https://gitlist.dev/e/vpqlhtym8lp.fsf%40anie.imag.fr In-Reply-To: <20140519005719.GB38299@tequila> ``` [ Cc-ing Ramkumar ] Karen Etheridge 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). -- Matthieu Moy http://www-verimag.imag.fr/~moy/ ``` ## Junio C Hamano, 2014-05-20 17:34 Subject: Re: bug: autostash is lost after aborted rebase Message-ID: URL: https://gitlist.dev/e/xmqqegzo1hhv.fsf%40gitster.dls.corp.google.com In-Reply-To: ``` Matthieu Moy writes: > [ Cc-ing Ramkumar ] > > Karen Etheridge 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, 2016-05-16 21:23 Subject: Re: bug: autostash is lost after aborted rebase Message-ID: <1463433794509-7656556.post@n2.nabble.com> URL: https://gitlist.dev/e/1463433794509-7656556.post%40n2.nabble.com In-Reply-To: ``` 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. ```