"Marcel M. Cary" [off-list ref] writes:
I sent the first rev of this patch to just Brian. It didn't have
either of the unit test changes. He said it fixed all but t2300.3,
where cd_to_toplevel doesn't actually "cd", so I made the same change
to the unit test itself. Can someone with OS X try running the test
suite with v2 of this patch? I don't have OS X readily available.
I think I saw a success report on the list. Care to resend it with
Sign-off (by you) and
Tested-by: tester [off-list ref] (on PLATFORM)
lines as you see necessary for application?
Thanks.
El 3/1/2009, a las 23:01, Junio C Hamano escribió:
"Marcel M. Cary" [off-list ref] writes:
quoted
I sent the first rev of this patch to just Brian. It didn't have
either of the unit test changes. He said it fixed all but t2300.3,
where cd_to_toplevel doesn't actually "cd", so I made the same change
to the unit test itself. Can someone with OS X try running the test
suite with v2 of this patch? I don't have OS X readily available.
I think I saw a success report on the list. Care to resend it with
Sign-off (by you) and
Tested-by: tester [off-list ref] (on PLATFORM)
lines as you see necessary for application?
Thanks.
I also tested it and can confirm that it fixes the failures on Mac OS
X 10.5.5. So feel free to add:
Tested-by: Wincent Colaiuta <redacted> (on Mac OS X 10.5.5)
Cheers,
Wincent
Am 03.01.2009 um 23:01 schrieb Junio C Hamano:
"Marcel M. Cary" [off-list ref] writes:
quoted
I sent the first rev of this patch to just Brian. It didn't have
either of the unit test changes. He said it fixed all but t2300.3,
where cd_to_toplevel doesn't actually "cd", so I made the same change
to the unit test itself. Can someone with OS X try running the test
suite with v2 of this patch? I don't have OS X readily available.
I think I saw a success report on the list. Care to resend it with
Sign-off (by you) and
Tested-by: tester [off-list ref] (on PLATFORM)
lines as you see necessary for application?
Thanks.
Hi,
please add
Tested-by: Marcel Koeppen <redacted> (on Mac OS X 10.5.6)
Marcel
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 <redacted>
Tested-by: Marcel Koeppen <redacted> (on Mac OS X 10.5.6)
---
please add
Tested-by: Marcel Koeppen <redacted> (on Mac OS X 10.5.6)
Now with the OS, in detail.
git-sh-setup.sh | 2 +-
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 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.diff --git a/t/t2300-cd-to-toplevel.sh b/t/t2300-cd-to-toplevel.sh
index beddb4e..e42cbfe 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--
1.6.1