diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-02-15 01:44:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-15 01:44:58 -0800 |
| commit | f7a2bdb1f070cd79879671391fa8121ef9930abe (patch) | |
| tree | 82dca95702b6488df3c099a570add33164df66d3 /t | |
| parent | 7b83a9243147a8cec4f556af1d29f2cc21c12518 (diff) | |
| parent | 2c3c395e84409c278bd7b050877c36d04b952056 (diff) | |
| download | git-f7a2bdb1f070cd79879671391fa8121ef9930abe.tar.gz git-f7a2bdb1f070cd79879671391fa8121ef9930abe.tar.xz | |
Merge branch 'mc/setup-cd-p'
* mc/setup-cd-p:
git-sh-setup: Use "cd" option, not /bin/pwd, for symlinked work tree
Diffstat (limited to 't')
| -rwxr-xr-x | t/t2300-cd-to-toplevel.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t2300-cd-to-toplevel.sh b/t/t2300-cd-to-toplevel.sh index e42cbfe6c..293dc353b 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 && - [ "$(unset PWD; /bin/pwd)" = "$TOPLEVEL" ] + [ "$(pwd -P)" = "$TOPLEVEL" ] ) ' } -TOPLEVEL="$(unset PWD; /bin/pwd)/repo" +TOPLEVEL="$(pwd -P)/repo" mkdir -p repo/sub/dir mv .git repo/ SUBDIRECTORY_OK=1 |