bug: autostash is lost after aborted rebase

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

bug: autostash is lost after aborted rebase

From: Karen Etheridge <hidden>
Date: 2016-06-15 23:01:14

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.)

RE: bug: autostash is lost after aborted rebase

From: Felipe Contreras <hidden>
Date: 2016-06-15 23:01:14

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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help