parse-options: make sure argh string does not have SP or _

diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
index b10f2cf21b904bbbc3fafc27d183d8ad7917b479..5381857c59968c38526140d53e3150f19e8d0b0c 100644 (file)
--- a/git-rebase--merge.sh
+++ b/git-rebase--merge.sh
@@ -1,4 +1,6 @@
-#!/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.
 #
@@ -25,7 +27,7 @@ continue_merge () {
        cmt=`cat "$state_dir/current"`
        if ! git diff-index --quiet --ignore-submodules HEAD --
        then
-               if ! git commit --no-verify -C "$cmt"
+               if ! git commit ${gpg_sign_opt:+"$gpg_sign_opt"} --no-verify -C "$cmt"
                then
                        echo "Commit failed, please do not call \"git commit\""
                        echo "directly, but instead do one of the following: "
@@ -96,7 +98,6 @@ finish_rb_merge () {
                        "$GIT_DIR"/hooks/post-rewrite rebase <"$state_dir"/rewritten
                fi
        fi
-       rm -r "$state_dir"
        say All done.
 }
 
@@ -110,7 +111,7 @@ continue)
                continue_merge
        done
        finish_rb_merge
-       exit
+       return
        ;;
 skip)
        read_state
@@ -122,7 +123,7 @@ skip)
                continue_merge
        done
        finish_rb_merge
-       exit
+       return
        ;;
 esac