summaryrefslogtreecommitdiff
path: root/git-sh-setup.sh
diff options
context:
space:
mode:
authorMarcel M. Cary <marcel@oak.homeunix.org>2009-02-07 03:24:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-02-07 08:45:29 (GMT)
commit2c3c395e84409c278bd7b050877c36d04b952056 (patch)
tree65662f26b92ed2d8c973964b6985d29b6db44149 /git-sh-setup.sh
parentba743d1b0ce0b44c797c0de06c9db2781e4d1fdd (diff)
downloadgit-2c3c395e84409c278bd7b050877c36d04b952056.zip
git-2c3c395e84409c278bd7b050877c36d04b952056.tar.gz
git-2c3c395e84409c278bd7b050877c36d04b952056.tar.bz2
git-sh-setup: Use "cd" option, not /bin/pwd, for symlinked work tree
In cd_to_toplevel, instead of 'cd $(unset PWD; /bin/pwd)/$path' use 'cd -P $path'. The "-P" option yields a desirable similarity to C chdir. While the "-P" option may be slightly less commonly supported than /bin/pwd, it is more concise, better tested, and less error prone. I've already added the 'unset PWD' to fix the /bin/pwd solution on BSD; there may be more edge cases out there. This still passes all the same test cases in t5521-pull-symlink.sh and t2300-cd-to-toplevel.sh, even before updating them to use 'pwd -P'. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-sh-setup.sh')
-rwxr-xr-xgit-sh-setup.sh29
1 files changed, 8 insertions, 21 deletions
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 2142308..8382339 100755
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -85,27 +85,14 @@ cd_to_toplevel () {
cdup=$(git rev-parse --show-cdup)
if test ! -z "$cdup"
then
- case "$cdup" in
- /*)
- # Not quite the same as if we did "cd -P '$cdup'" when
- # $cdup contains ".." after symlink path components.
- # Don't fix that case at least until Git switches to
- # "cd -P" across the board.
- phys="$cdup"
- ;;
- ..|../*|*/..|*/../*)
- # Interpret $cdup relative to the physical, not logical, cwd.
- # Probably /bin/pwd is more portable than passing -P to cd or pwd.
- phys="$(unset PWD; /bin/pwd)/$cdup"
- ;;
- *)
- # There's no "..", so no need to make things absolute.
- phys="$cdup"
- ;;
- esac
-
- cd "$phys" || {
- echo >&2 "Cannot chdir to $phys, the toplevel of the working tree"
+ # The "-P" option says to follow "physical" directory
+ # structure instead of following symbolic links. When cdup is
+ # "../", this means following the ".." entry in the current
+ # directory instead textually removing a symlink path element
+ # from the PWD shell variable. The "-P" behavior is more
+ # consistent with the C-style chdir used by most of Git.
+ cd -P "$cdup" || {
+ echo >&2 "Cannot chdir to $cdup, the toplevel of the working tree"
exit 1
}
fi