X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=git-sh-setup.sh;h=f38827529f2fd60743f5571948742fada975cf93;hb=aa8d53ec387a7baf72ab5e3a91c35bb5bf20eb4d;hp=b366761b976a136144c7483de5c883a084996816;hpb=467f42cfa1d298dcaab40e06f8dfa8f80ee345f7;p=git.git

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index b366761b9..f38827529 100755
--- 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,19 +119,14 @@ 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"
 }
 
 # Make sure we are in a valid repository of a vintage we understand,
 # if we require to be in a git repository.
-if test -n "$NONGIT_OK"
+if test -z "$NONGIT_OK"
 then
-	if git rev-parse --git-dir >/dev/null 2>&1
-	then
-		: ${GIT_DIR=.git}
-	fi
-else
 	if [ -z "$SUBDIRECTORY_OK" ]
 	then
 		: ${GIT_DIR=.git}