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 3c325fd1339608d681d3485aa37647d9ac734037..86d7d4c4e742c80e936d5f1c9f2037327eba7287 100755 (executable)
--- 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