From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 31 Oct 2007 04:38:11 +0000 (-0700)
Subject: Merge branch 'nd/worktree' into HEAD
X-Git-Tag: v1.5.4-rc0~298
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7eedc1c1b34bbcd72b66a5dbf10b21476c10df1a?hp=9725bb8b854ce9bb3642bc0e167e7d791e54c7a1

Merge branch 'nd/worktree' into HEAD

* nd/worktree:
git-sh-setup.sh: use "git rev-parse --show-cdup" to check for SUBDIRECTORY_OK
---

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 3c325fd133..86d7d4c4e7 100755
--- 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