X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-sh-setup.sh;fp=git-sh-setup.sh;h=e343349c0087aefbb42d17ace9102a72d2fb437a;hb=ae2b0f15180d4b044828c836bcab6a990efa5c8e;hp=dbb98842bf6327210c604ae65a128cdfc785b32c;hpb=e8cc80d03934cc607e3a4d89a05350c238dbf9c5;p=git.git

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index dbb98842..e343349c 100755
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -1,10 +1,9 @@
 #!/bin/sh
 #
-# Set up GIT_DIR and GIT_OBJECT_DIRECTORY
-# and return true if everything looks ok
-#
-: ${GIT_DIR=.git}
-: ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"}
+# This is included in commands that either have to be run from the toplevel
+# of the repository, or with GIT_DIR environment variable properly.
+# If the GIT_DIR does not look like the right correct git-repository,
+# it dies.
 
 # Having this variable in your environment would break scripts because
 # you would cause "cd" to be be taken to unexpected places.  If you
@@ -12,6 +11,9 @@
 # exporting it.
 unset CDPATH
 
+: ${GIT_DIR=.git}
+: ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"}
+
 die() {
 	echo >&2 "$@"
 	exit 1
@@ -22,4 +24,5 @@ refs/*)	: ;;
 *)	false ;;
 esac &&
 [ -d "$GIT_DIR/refs" ] &&
-[ -d "$GIT_OBJECT_DIRECTORY/" ]
+[ -d "$GIT_OBJECT_DIRECTORY/" ] ||
+	die "Not a git repository."