X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-sh-setup.sh;h=42f9b1c125578a7158392b53ec8792d6c6bbb273;hb=b8e9a00d40839a76928c54366a1c46ad54d7fd5d;hp=025ef2d5f6b37d89dab1d602e1d8d1a80ab7f42e;hpb=4bbdfab766782dc06ac496730e3a578bd35d67c5;p=git.git

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 025ef2d5f..42f9b1c12 100755
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -30,22 +30,17 @@ $LONG_USAGE"
 fi
 
 case "$1" in
-	--h|--he|--hel|--help)
+	-h|--h|--he|--hel|--help)
 	echo "$LONG_USAGE"
 	exit
 esac
 
+# Make sure we are in a valid repository of a vintage we understand.
 if [ -z "$SUBDIRECTORY_OK" ]
 then
 	: ${GIT_DIR=.git}
-	: ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"}
-
-	# Make sure we are in a valid repository of a vintage we understand.
-	GIT_DIR="$GIT_DIR" git repo-config --get core.nosuch >/dev/null
-	if test $? = 128
-	then
-	    exit
-	fi
+	GIT_DIR=$(GIT_DIR="$GIT_DIR" git-rev-parse --git-dir) || exit
 else
 	GIT_DIR=$(git-rev-parse --git-dir) || exit
 fi
+: ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"}