diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-10-30 21:38:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-10-30 21:38:11 -0700 |
| commit | 7eedc1c1b34bbcd72b66a5dbf10b21476c10df1a (patch) | |
| tree | de96df028bd6cdd60f6d7d74571d3c5a100a5460 | |
| parent | 9725bb8b854ce9bb3642bc0e167e7d791e54c7a1 (diff) | |
| parent | 6b9ff1e3bd089d1bef211ba74c12e056810755b8 (diff) | |
| download | git-7eedc1c1b34bbcd72b66a5dbf10b21476c10df1a.tar.gz | |
Merge branch 'nd/worktree' into HEAD
* nd/worktree:
git-sh-setup.sh: use "git rev-parse --show-cdup" to check for SUBDIRECTORY_OK
| -rwxr-xr-x | git-sh-setup.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |