git-sh-setup: do not use repo-config to test the git directory

Since repo-config does not fail in non-git directory, it is not
a good command to use to test the git-ness nor validate the
repository revision of $GIT_DIR.

Original patch by Robert Shearman but with minor fixes.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index d15747f1ed8f875a3c1bb7129e50bfbc8d2b033f..42f9b1c125578a7158392b53ec8792d6c6bbb273 100755 (executable)
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -35,17 +35,12 @@ case "$1" in
        exit
 esac
 
        exit
 esac
 

+# Make sure we are in a valid repository of a vintage we understand.

 if [ -z "$SUBDIRECTORY_OK" ]
 then
        : ${GIT_DIR=.git}
 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
 else
        GIT_DIR=$(git-rev-parse --git-dir) || exit
 fi

+: ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"}