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

Re: bug: autostash is lost after aborted rebase

From
Junio C Hamano <gitster@pobox.com>
Date
May 20, 2014, 17:34 UTC
Message-ID
<xmqqegzo1hhv.fsf@gitster.dls.corp.google.com>
In-Reply-To
<vpqlhtym8lp.fsf@anie.imag.fr>
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.

Previous: Matthieu MoyNext: Eugene Yarmash
Message 4 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.