From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 11 Nov 2016 21:56:30 +0000 (-0800)
Subject: Merge branch 'js/pwd-var-vs-pwd-cmd-fix'
X-Git-Tag: v2.11.0-rc1~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7f2a3921fb7f49da6a870fb3bfcad69631e70ca9?ds=inline;hp=-c

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
---

7f2a3921fb7f49da6a870fb3bfcad69631e70ca9
diff --combined t/t0021-conversion.sh
index da1ad3e70e,b93cd44546..4ea534e9fa
--- a/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