Merge branch 'po/error-message-style' into maint

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index fffa3c72d75961159888fd156614aa6679f3638c..5f28b32dc7ff75830bde919b2f4776f7a9b017e2 100644 (file)
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -72,6 +72,8 @@ if test -n "$OPTIONS_SPEC"; then
        parseopt_extra=
        [ -n "$OPTIONS_KEEPDASHDASH" ] &&
                parseopt_extra="--keep-dashdash"
+       [ -n "$OPTIONS_STUCKLONG" ] &&
+               parseopt_extra="$parseopt_extra --stuck-long"
 
        eval "$(
                echo "$OPTIONS_SPEC" |