Merge branch 'maint'

[git.git] / git-sh-setup.sh

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index e1cf885983f60c66472ccfa3c4b9e66b60255866..5aa62dda15d1c24d0b01845ded4c8bc15e98bf8a 100755 (executable)
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -23,9 +23,13 @@ if test -n "$OPTIONS_SPEC"; then
 
        parseopt_extra=
        [ -n "$OPTIONS_KEEPDASHDASH" ] &&
-               parseopt_extra="$parseopt_extra --keep-dashdash"
+               parseopt_extra="--keep-dashdash"
 
-       eval `echo "$OPTIONS_SPEC" | git rev-parse --parseopt $parseopt_extra -- "$@" || echo exit $?`
+       eval "$(
+               echo "$OPTIONS_SPEC" |
+                       git rev-parse --parseopt $parseopt_extra -- "$@" ||
+               echo exit $?
+       )"
 else
        usage() {
                die "Usage: $0 $USAGE"