git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: bug: autostash is lost after aborted rebase

From
PVPhilippe Vaucher <philippe.vaucher@gmail.com>
Date
May 19, 2014, 07:40 UTC
Message-ID
<CAGK7Mr6nMD5Q9ptvuWk9BRKwhEhtRdANSC5G=m3=2V2HgJYG4g@mail.gmail.com>
In-Reply-To
<CAGK7Mr532G+OSXLf4HAbWoJxV2fOvxnVQXC4nV9ciPsU4JR5bA@mail.gmail.com>
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
Previous: Eugene Yarmash
Message 6 of 6 in “bug: autostash is lost after aborted rebase”
  1. Karen EtheridgeMay 19, 2014
  2. Felipe ContrerasMay 19, 2014
  3. Matthieu MoyMay 19, 2014
  4. Junio C HamanoMay 20, 2014
  5. Eugene YarmashMay 16, 2016
  6. Philippe VaucherMay 19, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.