Merge branch 'js/pwd-var-vs-pwd-cmd-fix'
Last minute fixes to two fixups merged to 'master' recently. * js/pwd-var-vs-pwd-cmd-fix: t0021, t5615: use $PWD instead of $(pwd) in PATH-like shell variables
This commit is contained in:
commit
7f2a3921fb
@ -4,7 +4,7 @@ test_description='blob conversion via gitattributes'
|
|||||||
|
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
|
|
||||||
TEST_ROOT="$(pwd)"
|
TEST_ROOT="$PWD"
|
||||||
PATH=$TEST_ROOT:$PATH
|
PATH=$TEST_ROOT:$PATH
|
||||||
|
|
||||||
write_script <<\EOF "$TEST_ROOT/rot13.sh"
|
write_script <<\EOF "$TEST_ROOT/rot13.sh"
|
||||||
|
@ -31,14 +31,14 @@ test_expect_success 'objects inaccessible without alternates' '
|
|||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'access alternate via absolute path' '
|
test_expect_success 'access alternate via absolute path' '
|
||||||
check_obj "$(pwd)/one.git/objects" <<-EOF
|
check_obj "$PWD/one.git/objects" <<-EOF
|
||||||
$one blob
|
$one blob
|
||||||
$two missing
|
$two missing
|
||||||
EOF
|
EOF
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'access multiple alternates' '
|
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
|
$one blob
|
||||||
$two blob
|
$two blob
|
||||||
EOF
|
EOF
|
||||||
|
Loading…
Reference in New Issue
Block a user