Browse Source

t0021, t5615: use $PWD instead of $(pwd) in PATH-like shell variables

We have to use $PWD instead of $(pwd) because on Windows the latter
would add a C: style path to bash's Unix-style $PATH variable, which
becomes confused by the colon after the drive letter. ($PWD is a
Unix-style path.)

In the case of GIT_ALTERNATE_OBJECT_DIRECTORIES, bash on Windows
assembles a Unix-style path list with the colon as separators. It
converts the value to a Windows-style path list with the semicolon as
path separator when it forwards the variable to git.exe. The same
confusion happens when bash's original value is contaminated with
Windows style paths.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Johannes Sixt 8 years ago committed by Junio C Hamano
parent
commit
71dd50472d
  1. 2
      t/t0021-conversion.sh
  2. 4
      t/t5615-alternate-env.sh

2
t/t0021-conversion.sh

@ -4,7 +4,7 @@ test_description='blob conversion via gitattributes' @@ -4,7 +4,7 @@ test_description='blob conversion via gitattributes'

. ./test-lib.sh

TEST_ROOT="$(pwd)"
TEST_ROOT="$PWD"
PATH=$TEST_ROOT:$PATH

write_script <<\EOF "$TEST_ROOT/rot13.sh"

4
t/t5615-alternate-env.sh

@ -31,14 +31,14 @@ test_expect_success 'objects inaccessible without alternates' ' @@ -31,14 +31,14 @@ test_expect_success 'objects inaccessible without alternates' '
'

test_expect_success 'access alternate via absolute path' '
check_obj "$(pwd)/one.git/objects" <<-EOF
check_obj "$PWD/one.git/objects" <<-EOF
$one blob
$two missing
EOF
'

test_expect_success 'access multiple alternates' '
check_obj "$(pwd)/one.git/objects:$(pwd)/two.git/objects" <<-EOF
check_obj "$PWD/one.git/objects:$PWD/two.git/objects" <<-EOF
$one blob
$two blob
EOF

Loading…
Cancel
Save