mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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
This commit is contained in:
commit
20bd35c110
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue