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

Re: [PATCH v2] rebase -i: restore autostash on abort

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jun 29, 2016, 14:02 UTC
Message-ID
<alpine.DEB.2.20.1606291600300.12947@virtualbox>
In-Reply-To
<20160629062127.8946-1-ps@pks.im>
Hi Patrick,
On Wed, 29 Jun 2016, Patrick Steinhardt wrote:
Show 9 quoted lines
> When we abort an interactive rebase we do so by calling
> `die_abort`, which cleans up after us by removing the rebase
> state directory. If the user has requested to use the autostash
> feature, though, the state directory may also contain a reference
> to the autostash, which will now be deleted.
> 
> Fix the issue by trying to re-apply the autostash in `die_abort`.
> This will also handle the case where the autostash does not apply
> cleanly anymore by recording it in a user-visible stash.

I like it. Thanks for including the tests, they were very helpful to verify that my rebase--helper work is unaffected: the patch touches only those parts that are not moved into the rebase--helper.

Thanks, Johannes

Previous: Patrick Steinhardt
Message 7 of 7 in “rebase -i: restore autostash on abort”
  1. rebase -i: restore autostash on abortPatrick Steinhardt, Jun 28, 2016
  2. Junio C HamanoJun 28, 2016
  3. Matthieu MoyJun 28, 2016
  4. Junio C HamanoJun 28, 2016
  5. Patrick SteinhardtJun 29, 2016
  6. rebase -i: restore autostash on abortPatrick Steinhardt, Jun 29, 2016
  7. Johannes SchindelinJun 29, 2016

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.