diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-29 08:41:56 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-29 08:41:56 +0100 |
| commit | 20bd35c1103930e690362d0342cdc54c5a97e4b1 (patch) | |
| tree | 033d5619bac568b98156381b54e8775eafffa342 | |
| parent | Merge branch 'maint-1.6.0' into maint (diff) | |
| parent | git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on OS X (diff) | |
| download | git-20bd35c1103930e690362d0342cdc54c5a97e4b1.tar.xz git-20bd35c1103930e690362d0342cdc54c5a97e4b1.zip | |
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
| -rwxr-xr-x | git-sh-setup.sh | 2 | ||||
| -rwxr-xr-x | t/t2300-cd-to-toplevel.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/git-sh-setup.sh b/git-sh-setup.sh index f07d96b9b5..2142308bcc 100755 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -96,7 +96,7 @@ cd_to_toplevel () { ..|../*|*/..|*/../*) # Interpret $cdup relative to the physical, not logical, cwd. # Probably /bin/pwd is more portable than passing -P to cd or pwd. - phys="$(/bin/pwd)/$cdup" + phys="$(unset PWD; /bin/pwd)/$cdup" ;; *) # There's no "..", so no need to make things absolute. diff --git a/t/t2300-cd-to-toplevel.sh b/t/t2300-cd-to-toplevel.sh index beddb4e9f2..e42cbfe6c6 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 |