tests: use "env" to run commands with temporary env-var settings

diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
index dc599077f0e55472ae814ed4e15f5b3a1b729caf..e7d96de9adcb133982bbbc6d20cd3b52b3c89214 100644 (file)
--- a/git-rebase--merge.sh
+++ b/git-rebase--merge.sh
@@ -1,10 +1,10 @@
-#!/bin/sh
+# This shell script fragment is sourced by git-rebase to implement
+# its merge-based non-interactive mode that copes well with renamed
+# files.
 #
 # Copyright (c) 2010 Junio C Hamano.
 #
 
-. git-sh-setup
-
 prec=4
 
 read_state () {
@@ -98,7 +98,6 @@ finish_rb_merge () {
                        "$GIT_DIR"/hooks/post-rewrite rebase <"$state_dir"/rewritten
                fi
        fi
-       rm -r "$state_dir"
        say All done.
 }
 
@@ -112,7 +111,7 @@ continue)
                continue_merge
        done
        finish_rb_merge
-       exit
+       return
        ;;
 skip)
        read_state
@@ -124,7 +123,7 @@ skip)
                continue_merge
        done
        finish_rb_merge
-       exit
+       return
        ;;
 esac