aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-11-11 13:56:30 -0800
committerJunio C Hamano <gitster@pobox.com>2016-11-11 13:56:30 -0800
commit7f2a3921fb7f49da6a870fb3bfcad69631e70ca9 (patch)
tree0baf32c0a4c7b069e2d57172494a4bff55e0e5b8 /t
parent332fd5655a1e162b2fe47009dfc77ca2a94908e7 (diff)
parent71dd50472d6be8ff91ab0dcfa2413daeaba14baa (diff)
downloadgit-7f2a3921fb7f49da6a870fb3bfcad69631e70ca9.tar.gz
git-7f2a3921fb7f49da6a870fb3bfcad69631e70ca9.tar.xz
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
Diffstat (limited to 't')
-rwxr-xr-xt/t0021-conversion.sh2
-rwxr-xr-xt/t5615-alternate-env.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index da1ad3e70..4ea534e9f 100755
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -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"
diff --git a/t/t5615-alternate-env.sh b/t/t5615-alternate-env.sh
index 22d9d8178..eec4137ca 100755
--- a/t/t5615-alternate-env.sh
+++ b/t/t5615-alternate-env.sh
@@ -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