aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-28 23:41:56 -0800
committerJunio C Hamano <gitster@pobox.com>2009-01-28 23:41:56 -0800
commit20bd35c1103930e690362d0342cdc54c5a97e4b1 (patch)
tree033d5619bac568b98156381b54e8775eafffa342 /t
parent8561b522d756861a41c0c54dfa2f609c7063887a (diff)
parentdd6c1360b22ee89cb179e2a1fface98ecbeb7b3e (diff)
downloadgit-20bd35c1103930e690362d0342cdc54c5a97e4b1.tar.gz
git-20bd35c1103930e690362d0342cdc54c5a97e4b1.tar.xz
Merge branch 'mc/cd-p-pwd' into maint
* mc/cd-p-pwd: git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on OS X
Diffstat (limited to 't')
-rwxr-xr-xt/t2300-cd-to-toplevel.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t2300-cd-to-toplevel.sh b/t/t2300-cd-to-toplevel.sh
index beddb4e9f..e42cbfe6c 100755
--- a/t/t2300-cd-to-toplevel.sh
+++ b/t/t2300-cd-to-toplevel.sh
@@ -10,12 +10,12 @@ test_cd_to_toplevel () {
cd '"'$1'"' &&
. git-sh-setup &&
cd_to_toplevel &&
- [ "$(/bin/pwd)" = "$TOPLEVEL" ]
+ [ "$(unset PWD; /bin/pwd)" = "$TOPLEVEL" ]
)
'
}
-TOPLEVEL="$(/bin/pwd)/repo"
+TOPLEVEL="$(unset PWD; /bin/pwd)/repo"
mkdir -p repo/sub/dir
mv .git repo/
SUBDIRECTORY_OK=1