summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-08-12 01:47:50 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-08-12 01:52:43 (GMT)
commitc8769f76d992ed391d169cd71be009ca17727271 (patch)
tree6c612cf2f6452237738c89de1761e4eb44320d68
parent308906fa6e98132cab839a4f42701386fba368ef (diff)
downloadgit-c8769f76d992ed391d169cd71be009ca17727271.zip
git-c8769f76d992ed391d169cd71be009ca17727271.tar.gz
git-c8769f76d992ed391d169cd71be009ca17727271.tar.bz2
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>
-rwxr-xr-xgit-sh-setup.sh11
1 files changed, 3 insertions, 8 deletions
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index d15747f..42f9b1c 100755
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -35,17 +35,12 @@ case "$1" in
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"}