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

diff --combined t/t0021-conversion.sh
index da1ad3e70ea140ecd5ac0741a146084ba518523f,b93cd44546f6933a313ebcc5fd273f2b953fa1c2..4ea534e9fa70ea302d4a88a8bc922c100f896873
--- 1/t/t0021-conversion.sh
--- 2/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@@ -4,7 -4,7 +4,7 @@@ test_description='blob conversion via g
  
  . ./test-lib.sh
  
- TEST_ROOT="$(pwd)"
+ TEST_ROOT="$PWD"
  PATH=$TEST_ROOT:$PATH
  
  write_script <<\EOF "$TEST_ROOT/rot13.sh"
@@@ -29,7 -29,8 +29,7 @@@ file_size () 
  
  filter_git () {
        rm -f rot13-filter.log &&
 -      git "$@" 2>git-stderr.log &&
 -      rm -f git-stderr.log
 +      git "$@"
  }
  
  # Compare two files and ensure that `clean` and `smudge` respectively are