builtin/apply: make add_conflicted_stages_file() return -1 on error

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index a545d92c269618f50c0d4989b3ae940c728b64a4..ded459563816ebe36f4e467f596f0c84fa30ff57 100644 (file)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -191,7 +191,6 @@ make_patch () {
 die_with_patch () {
        echo "$1" > "$state_dir"/stopped-sha
        make_patch "$1"
-       git rerere
        die "$2"
 }
 
@@ -213,6 +212,7 @@ Once you are satisfied with your changes, run
 }
 
 die_abort () {
+       apply_autostash
        rm -rf "$state_dir"
        die "$1"
 }
@@ -1090,8 +1090,8 @@ The possible behaviours are: ignore, warn, error.")"
 # below were not inside any function, and expected to return
 # to the function that dot-sourced us.
 #
-# However, FreeBSD /bin/sh misbehaves on such a construct and
-# continues to run the statements that follow such a "return".
+# However, older (9.x) versions of FreeBSD /bin/sh misbehave on such a
+# construct and continue to run the statements that follow such a "return".
 # As a work-around, we introduce an extra layer of a function
 # here, and immediately call it after defining it.
 git_rebase__interactive () {