upload-pack: no longer call rev-list

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

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index b4f10224baf8328a9d6efa761b025450df414bb2..42f9b1c125578a7158392b53ec8792d6c6bbb273 100755 (executable)
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -11,13 +11,36 @@
 # exporting it.
 unset CDPATH
 
-: ${GIT_DIR=.git}
-: ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"}
-
 die() {
        echo >&2 "$@"
        exit 1
 }
 
+usage() {
+       die "Usage: $0 $USAGE"
+}
+
+if [ -z "$LONG_USAGE" ]
+then
+       LONG_USAGE="Usage: $0 $USAGE"
+else
+       LONG_USAGE="Usage: $0 $USAGE
+
+$LONG_USAGE"
+fi
+
+case "$1" in
+       -h|--h|--he|--hel|--help)
+       echo "$LONG_USAGE"
+       exit
+esac
+
 # 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
+if [ -z "$SUBDIRECTORY_OK" ]
+then
+       : ${GIT_DIR=.git}
+       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"}