Merge branch 'maint'

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

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 270d559297259d8a94f7b5b25b87649d00139e84..f38827529f2fd60743f5571948742fada975cf93 100755 (executable)
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -18,7 +18,8 @@ die() {
 
 if test -n "$OPTIONS_SPEC"; then
        usage() {
-               exec "$0" -h
+               "$0" -h
+               exit 1
        }
 
        parseopt_extra=
@@ -118,7 +119,7 @@ get_author_ident_from_commit () {
        }
        '
        encoding=$(git config i18n.commitencoding || echo UTF-8)
-       git show -s --pretty=raw --encoding="$encoding" "$1" |
+       git show -s --pretty=raw --encoding="$encoding" "$1" -- |
        LANG=C LC_ALL=C sed -ne "$pick_author_script"
 }