summaryrefslogtreecommitdiff
path: root/git-sh-setup.sh
diff options
context:
space:
mode:
authorMarcel M. Cary <marcel@oak.homeunix.org>2008-12-30 15:10:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-01-05 19:46:58 (GMT)
commitdd6c1360b22ee89cb179e2a1fface98ecbeb7b3e (patch)
tree8e65ca983364c4f79b6fe91b9bf18c3fcd3cba1e /git-sh-setup.sh
parent8104ebfe8276657ee803cca7eb8665a78cf3ef83 (diff)
downloadgit-dd6c1360b22ee89cb179e2a1fface98ecbeb7b3e.zip
git-dd6c1360b22ee89cb179e2a1fface98ecbeb7b3e.tar.gz
git-dd6c1360b22ee89cb179e2a1fface98ecbeb7b3e.tar.bz2
git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on OS X
On Mac OS X and possibly BSDs, /bin/pwd reads PWD from the environment if available and shows the logical path by default rather than the physical one. Unset PWD before running /bin/pwd in both cd_to_toplevel and its test. Still use the external /bin/pwd because in my Bash on Linux, the builtin pwd prints the same result whether or not PWD is set. Signed-off-by: Marcel M. Cary <marcel@oak.homeunix.org> Tested-by: Wincent Colaiuta <win@wincent.com> (on Mac OS X 10.5.5) Tested-by: Marcel Koeppen <git-dev@marzelpan.de> (on Mac OS X 10.5.6) Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-sh-setup.sh')
-rwxr-xr-xgit-sh-setup.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index f07d96b..2142308 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.