Merge branch 'rs/notes-merge-no-toctou' into maint

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 05f22e43ccfe485b2a676f96ddec1a99f7a84612..4f499d2c13e7a891aa46b23fcb27308b52b0d235 100644 (file)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -212,6 +212,7 @@ exit_with_patch () {
 }
 
 die_abort () {
+       apply_autostash
        rm -rf "$state_dir"
        die "$1"
 }