From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Jan 2017 23:19:04 +0000 (-0800)
Subject: Merge branch 'ls/t0021-fixup' into maint
X-Git-Tag: v2.11.1~33
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/13236160c3ce46b84c4605a04a877ef7a407b539?ds=inline;hp=-c

Merge branch 'ls/t0021-fixup' into maint

* ls/t0021-fixup:
t0021: minor filter process test cleanup
---

13236160c3ce46b84c4605a04a877ef7a407b539
diff --combined t/t0021-conversion.sh
index 4ea534e9fa,35710c2707..34891c4b1a
--- 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"
@@@ -350,10 -350,9 +350,9 @@@ test_expect_success PERL 'required proc
  		cd repo &&
  		git init &&
  
- 		echo "git-stderr.log" >.gitignore &&
  		echo "*.r filter=protocol" >.gitattributes &&
  		git add . &&
- 		git commit . -m "test commit 1" &&
+ 		git commit -m "test commit 1" &&
  		git branch empty-branch &&
  
  		cp "$TEST_ROOT/test.o" test.r &&
@@@ -378,7 -377,7 +377,7 @@@
  		EOF
  		test_cmp_count expected.log rot13-filter.log &&
  
- 		filter_git commit . -m "test commit 2" &&
+ 		filter_git commit -m "test commit 2" &&
  		cat >expected.log <<-EOF &&
  			START
  			init handshake complete