Merge branch 'ls/t0021-fixup'
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Dec 2016 22:45:30 +0000 (14:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Dec 2016 22:45:30 +0000 (14:45 -0800)
* ls/t0021-fixup:
t0021: minor filter process test cleanup

1  2 
t/t0021-conversion.sh
diff --combined t/t0021-conversion.sh
index 4ea534e9fa70ea302d4a88a8bc922c100f896873,35710c2707789a6b38ca8de344148f46d9789607..34891c4b1ad1c53ebc78b18484c7c146659ce68d
@@@ -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 &&
                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