Merge branch 'nd/worktree' into HEAD

* nd/worktree: git-sh-setup.sh: use "git rev-parse --show-cdup" to check for SUBDIRECTORY_OK
git-mirror · Oct 31, 2007 · 7eedc1c · 7eedc1c
2 parents 9725bb8 + 6b9ff1e
commit 7eedc1c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
@@ -110,7 +110,7 @@ esac
 if [ -z "$SUBDIRECTORY_OK" ]
 then
 	: ${GIT_DIR=.git}
-	GIT_DIR=$(GIT_DIR="$GIT_DIR" git rev-parse --git-dir) || {
+	test -z "$(git rev-parse --show-cdup)" || {
 		exit=$?
 		echo >&2 "You need to run this command from the toplevel of the working tree."
 		exit $exit