{"thread":{"id":"42621","subject":"\"git-rebase -i --autostash\" will leave dangling stash when editor is aborted","startedAt":"2016-06-16T06:55:53Z","lastAt":"2016-06-16T06:55:53Z","messageCount":1,"participants":["Daniel Hahler"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"289325","messageId":"1b5e2f4b-7a3d-7554-3aa0-79231bee039e@thequod.de","threadId":"42621","inReplyTo":null,"subject":"\"git-rebase -i --autostash\" will leave dangling stash when editor is aborted","fromName":"Daniel Hahler","fromEmail":"git@thequod.de","sentAt":"2016-06-15T21:56:17Z","receivedAt":"2016-06-16T06:55:53Z","isPatch":false,"sender":{"key":"git@thequod.de","avatar":"https://gravatar.com/avatar/7ca36ccd9ac57f02a433e4ecf2e28e6e23abce8b005a408498f516b74232da67?d=mp&s=160"},"body":"TEST CASE:\n\n1. Modify a file that need to get stashed on rebasing\n2. Run \"EDITOR=vim git rebase -i --autostash\"\n3. Abort with \":cq\", which will make Vim exit non-zero\n\nGit then will create an autostash, but aborts with \"Could not execute\neditor\", via the following code in git-rebase--interactive.sh, and does\nnot restore the autostash - it does not show up with the regular\nstashes, like when there is a conflict during the rebase:\n\n    git_sequence_editor \"$todo\" ||\n        die_abort \"Could not execute editor\"\n\nStep 2 and 3 and probably merged into a single one for a test case, but\nthat's how I keep triggering it.\n\nInstead of adding it to the list of stashes, it should probably get\nrestored/re-applied right away, since no rebase actions have been triggered.\n\n\nPlease CC me in replies.\n\n\nCheers,\nDaniel.\n"}]}