diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-11-11 13:56:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-11 13:56:30 -0800 |
| commit | 7f2a3921fb7f49da6a870fb3bfcad69631e70ca9 (patch) | |
| tree | 0baf32c0a4c7b069e2d57172494a4bff55e0e5b8 | |
| parent | 332fd5655a1e162b2fe47009dfc77ca2a94908e7 (diff) | |
| parent | 71dd50472d6be8ff91ab0dcfa2413daeaba14baa (diff) | |
| download | git-7f2a3921fb7f49da6a870fb3bfcad69631e70ca9.tar.gz | |
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
| -rwxr-xr-x | t/t0021-conversion.sh | 2 | ||||
| -rwxr-xr-x | t/t5615-alternate-env.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh index da1ad3e70e..4ea534e9fa 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 22d9d8178b..eec4137ca5 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 |