X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-sh-setup.sh;h=42f9b1c125578a7158392b53ec8792d6c6bbb273;hb=b32d37a3a6817ba307062fe2f7b6d9cfb85a1ebd;hp=1e638e493d51c9216e3d2e93aad5657cdf9793b4;hpb=90768daaa006516c7ae69ed89d7c2e67243dfac1;p=git.git

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 1e638e493..42f9b1c12 100755
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -30,18 +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-var GIT_AUTHOR_IDENT >/dev/null || exit
+	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"}