From dd6c1360b22ee89cb179e2a1fface98ecbeb7b3e Mon Sep 17 00:00:00 2001 From: "Marcel M. Cary" Date: Tue, 30 Dec 2008 07:10:24 -0800 Subject: 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 Tested-by: Wincent Colaiuta (on Mac OS X 10.5.5) Tested-by: Marcel Koeppen (on Mac OS X 10.5.6) Signed-off-by: Junio C Hamano --- git-sh-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git-sh-setup.sh') 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. -- cgit v1.3