mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'nd/worktree' into HEAD
* nd/worktree: git-sh-setup.sh: use "git rev-parse --show-cdup" to check for SUBDIRECTORY_OK
This commit is contained in:
commit
7eedc1c1b3
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue