{"thread":{"id":"36695","subject":"bug: autostash is lost after aborted rebase","startedAt":"2014-05-19T00:57:20Z","lastAt":"2016-05-16T21:23:14Z","messageCount":6,"participants":["Karen Etheridge","Felipe Contreras","Philippe Vaucher","Matthieu Moy","Junio C Hamano","Eugene Yarmash"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"242139","messageId":"20140519005719.GB38299@tequila","threadId":"36695","inReplyTo":null,"subject":"bug: autostash is lost after aborted rebase","fromName":"Karen Etheridge","fromEmail":"ether@cpan.org","sentAt":"2014-05-19T00:57:20Z","receivedAt":"2014-05-19T00:57:20Z","isPatch":false,"sender":{"key":"ether@cpan.org","avatar":null},"body":"\nscenario: \n- edit some tracked files; do not add them to the index\n- \"git config rebase.autostash true\"\n- \"git rebase -i HEAD~3\" (an autostash will be created)\n- delete the entire buffer and save/exit the editor - this will abort the\n rebase\n\npoof, the autostash is gone (it is not reapplied) -- it must be explicitly\napplied again via the SHA that was printed earlier.\n\n\n(please cc me; I am not subscribed to the list.)\n"},{"id":"242141","messageId":"537960a5f0d95_10da88d308b6@nysa.notmuch","threadId":"36695","inReplyTo":"20140519005719.GB38299@tequila","subject":"RE: bug: autostash is lost after aborted rebase","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2014-05-19T01:38:45Z","receivedAt":"2014-05-19T01:38:45Z","isPatch":false,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Karen Etheridge wrote:\n> \n> scenario: \n> - edit some tracked files; do not add them to the index\n> - \"git config rebase.autostash true\"\n> - \"git rebase -i HEAD~3\" (an autostash will be created)\n> - delete the entire buffer and save/exit the editor - this will abort the\n> rebase\n> \n> poof, the autostash is gone (it is not reapplied) -- it must be explicitly\n> applied again via the SHA that was printed earlier.\n\nYeah, I noticed this issue while rewriting `git rebase` in Ruby. I also\nnoticed many other issues and inconsistencies that happen depending on what\narguments you pass to `git rebase`.\n\nI'm in the process of writing a much more improved and consistent\n`git rebase` in Ruby with a different interface. Sadly it's still not ready.\n\n> (please cc me; I am not subscribed to the list.)\n\nNo need to say that, only on mailing lists that do Reply-To munging, and\nGit is not one of them.\n\nCheers.\n\n-- \nFelipe Contreras\n"},{"id":"242144","messageId":"CAGK7Mr6nMD5Q9ptvuWk9BRKwhEhtRdANSC5G=m3=2V2HgJYG4g@mail.gmail.com","threadId":"36695","inReplyTo":"CAGK7Mr532G+OSXLf4HAbWoJxV2fOvxnVQXC4nV9ciPsU4JR5bA@mail.gmail.com","subject":"Re: bug: autostash is lost after aborted rebase","fromName":"Philippe Vaucher","fromEmail":"philippe.vaucher@gmail.com","sentAt":"2014-05-19T07:40:23Z","receivedAt":"2014-05-19T07:40:23Z","isPatch":false,"sender":{"key":"philippe.vaucher@gmail.com","avatar":null},"body":"> scenario:\n> - edit some tracked files; do not add them to the index\n> - \"git config rebase.autostash true\"\n> - \"git rebase -i HEAD~3\" (an autostash will be created)\n> - delete the entire buffer and save/exit the editor - this will abort the\n> rebase\n>\n> poof, the autostash is gone (it is not reapplied) -- it must be explicitly\n> applied again via the SHA that was printed earlier.\n\nYes, I hit this often and it's annoying in \"sausage making\" workflows.\nThanks for reporting this issue, I don't know why I didn't think of\nreporting it myself :) It likely affects a large portion of the users\nwho like to set `rebase.autostash` and rebase.autosquash` in their\nconfig, but for some reason they didn't think of reporting it either.\n\nPhilippe\n"},{"id":"242148","messageId":"vpqlhtym8lp.fsf@anie.imag.fr","threadId":"36695","inReplyTo":"20140519005719.GB38299@tequila","subject":"Re: bug: autostash is lost after aborted rebase","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2014-05-19T09:16:34Z","receivedAt":"2014-05-19T09:16:34Z","isPatch":false,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"[ Cc-ing Ramkumar ]\n\nKaren Etheridge writes:\n\n> scenario: \n> - edit some tracked files; do not add them to the index\n> - \"git config rebase.autostash true\"\n> - \"git rebase -i HEAD~3\" (an autostash will be created)\n> - delete the entire buffer and save/exit the editor - this will abort the\n> rebase\n>\n> poof, the autostash is gone (it is not reapplied) -- it must be explicitly\n> applied again via the SHA that was printed earlier.\n\nIndeed. Confirmed, even with pu (I thought I remembered seeing a fix on\nthe list, but I must have mixed up with something else).\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"242290","messageId":"xmqqegzo1hhv.fsf@gitster.dls.corp.google.com","threadId":"36695","inReplyTo":"vpqlhtym8lp.fsf@anie.imag.fr","subject":"Re: bug: autostash is lost after aborted rebase","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-05-20T17:34:36Z","receivedAt":"2014-05-20T17:34:36Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Matthieu Moy writes:\n\n> [ Cc-ing Ramkumar ]\n>\n> Karen Etheridge writes:\n>\n>> scenario: \n>> - edit some tracked files; do not add them to the index\n>> - \"git config rebase.autostash true\"\n>> - \"git rebase -i HEAD~3\" (an autostash will be created)\n>> - delete the entire buffer and save/exit the editor - this will abort the\n>> rebase\n>>\n>> poof, the autostash is gone (it is not reapplied) -- it must be explicitly\n>> applied again via the SHA that was printed earlier.\n>\n> Indeed. Confirmed, even with pu (I thought I remembered seeing a fix on\n> the list, but I must have mixed up with something else).\n\nThanks. I see Ram's patch to address this on the list. Will pick\nit up and queue for post-release, as this is a fairly old breakage\ndating as far back as v1.8.4, if I am not mistaken.\n"},{"id":"286721","messageId":"1463433794509-7656556.post@n2.nabble.com","threadId":"36695","inReplyTo":"xmqqegzo1hhv.fsf@gitster.dls.corp.google.com","subject":"Re: bug: autostash is lost after aborted rebase","fromName":"Eugene Yarmash","fromEmail":"e.yarmash@gmail.com","sentAt":"2016-05-16T21:23:14Z","receivedAt":"2016-05-16T21:23:14Z","isPatch":false,"sender":{"key":"e.yarmash@gmail.com","avatar":null},"body":"The bug still persists when you abort the rebase by using :cq in Vim (exit\nwith an error code).\nSee also http://stackoverflow.com/q/37252108/244297\n\n\n\n--\nView this message in context: http://git.661346.n2.nabble.com/bug-autostash-is-lost-after-aborted-rebase-tp7611141p7656556.html\nSent from the git mailing list archive at Nabble.com.\n"}]}