* bug: autostash is lost after aborted rebase
@ 2014-05-19 0:57 Karen Etheridge
2014-05-19 1:38 ` Felipe Contreras
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Karen Etheridge @ 2014-05-19 0:57 UTC (permalink / raw)
To: git
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.)
^ permalink raw reply [flat|nested] 6+ messages in thread* RE: bug: autostash is lost after aborted rebase
2014-05-19 0:57 bug: autostash is lost after aborted rebase Karen Etheridge
@ 2014-05-19 1:38 ` Felipe Contreras
[not found] ` <CAGK7Mr532G+OSXLf4HAbWoJxV2fOvxnVQXC4nV9ciPsU4JR5bA@mail.gmail.com>
2014-05-19 9:16 ` Matthieu Moy
2 siblings, 0 replies; 6+ messages in thread
From: Felipe Contreras @ 2014-05-19 1:38 UTC (permalink / raw)
To: Karen Etheridge, git
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
^ permalink raw reply [flat|nested] 6+ messages in thread[parent not found: <CAGK7Mr532G+OSXLf4HAbWoJxV2fOvxnVQXC4nV9ciPsU4JR5bA@mail.gmail.com>]
* Re: bug: autostash is lost after aborted rebase
[not found] ` <CAGK7Mr532G+OSXLf4HAbWoJxV2fOvxnVQXC4nV9ciPsU4JR5bA@mail.gmail.com>
@ 2014-05-19 7:40 ` Philippe Vaucher
0 siblings, 0 replies; 6+ messages in thread
From: Philippe Vaucher @ 2014-05-19 7:40 UTC (permalink / raw)
To: Karen Etheridge; +Cc: git@vger.kernel.org
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: bug: autostash is lost after aborted rebase
2014-05-19 0:57 bug: autostash is lost after aborted rebase Karen Etheridge
2014-05-19 1:38 ` Felipe Contreras
[not found] ` <CAGK7Mr532G+OSXLf4HAbWoJxV2fOvxnVQXC4nV9ciPsU4JR5bA@mail.gmail.com>
@ 2014-05-19 9:16 ` Matthieu Moy
2014-05-20 17:34 ` Junio C Hamano
2 siblings, 1 reply; 6+ messages in thread
From: Matthieu Moy @ 2014-05-19 9:16 UTC (permalink / raw)
To: Karen Etheridge; +Cc: Ramkumar Ramachandra, git
[ 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).
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: bug: autostash is lost after aborted rebase
2014-05-19 9:16 ` Matthieu Moy
@ 2014-05-20 17:34 ` Junio C Hamano
2016-05-16 21:23 ` Eugene Yarmash
0 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2014-05-20 17:34 UTC (permalink / raw)
To: Matthieu Moy; +Cc: Karen Etheridge, Ramkumar Ramachandra, git
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
> [ 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.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-05-16 21:31 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-19 0:57 bug: autostash is lost after aborted rebase Karen Etheridge
2014-05-19 1:38 ` Felipe Contreras
[not found] ` <CAGK7Mr532G+OSXLf4HAbWoJxV2fOvxnVQXC4nV9ciPsU4JR5bA@mail.gmail.com>
2014-05-19 7:40 ` Philippe Vaucher
2014-05-19 9:16 ` Matthieu Moy
2014-05-20 17:34 ` Junio C Hamano
2016-05-16 21:23 ` Eugene Yarmash
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).