X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-sh-setup.sh;h=b4f10224baf8328a9d6efa761b025450df414bb2;hb=2c4ed386e8861e730037abe4f4d9e032c5c46242;hp=06d8299ce067a424f047a2830a23ad302d56ec00;hpb=215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7;p=git.git

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 06d8299c..b4f10224 100755
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -1,27 +1,23 @@
 #!/bin/sh
 #
-# Set up GIT_DIR and GIT_OBJECT_DIRECTORY
-# and return true if everything looks ok
-#
+# 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
+# like CDPATH, define it for your interactive shell sessions without
+# exporting it.
+unset CDPATH
+
 : ${GIT_DIR=.git}
 : ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"}
 
 die() {
-	echo "$@" >&2
+	echo >&2 "$@"
 	exit 1
 }
 
-check_clean_tree() {
-    dirty1_=`git-update-index -q --refresh` && {
-    dirty2_=`git-diff-index --name-only --cached HEAD`
-    case "$dirty2_" in '') : ;; *) (exit 1) ;; esac
-    } || {
-	echo >&2 "$dirty1_"
-	echo "$dirty2_" | sed >&2 -e 's/^/modified: /'
-	(exit 1)
-    }
-}
-
-[ -h "$GIT_DIR/HEAD" ] &&
-[ -d "$GIT_DIR/refs" ] &&
-[ -d "$GIT_OBJECT_DIRECTORY/00" ]
+# 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