Revert "t/lib-git-daemon: record daemon log"

diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index 9479a4aaabc1a4187fc702f864642ac493508bb9..fd5f1ac649dc411bf3c70dcb54f7965e4006aca8 100755 (executable)
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -166,10 +166,10 @@ test_expect_success expanded_in_repo '
        rm -f expanded-keywords expanded-keywords-crlf &&
 
        git checkout -- expanded-keywords &&
-       test_cmp expanded-keywords expected-output &&
+       test_cmp expected-output expanded-keywords &&
 
        git checkout -- expanded-keywords-crlf &&
-       test_cmp expanded-keywords-crlf expected-output-crlf
+       test_cmp expected-output-crlf expanded-keywords-crlf
 '
 
 # The use of %f in a filter definition is expanded to the path to
@@ -583,7 +583,7 @@ test_expect_success PERL 'process filter should restart after unexpected write f
                git checkout --quiet --no-progress . 2>git-stderr.log &&
 
                grep "smudge write error at" git-stderr.log &&
-               grep "error: external filter" git-stderr.log &&
+               test_i18ngrep "error: external filter" git-stderr.log &&
 
                cat >expected.log <<-EOF &&
                        START
@@ -785,7 +785,7 @@ test_expect_success PERL 'missing file in delayed checkout' '
                cd repo &&
                git init &&
                echo "*.a filter=bug" >.gitattributes &&
-               cp "$TEST_ROOT/test.o" missing-delay.a
+               cp "$TEST_ROOT/test.o" missing-delay.a &&
                git add . &&
                git commit -m "test commit"
        ) &&
@@ -807,7 +807,7 @@ test_expect_success PERL 'invalid file in delayed checkout' '
                git init &&
                echo "*.a filter=bug" >.gitattributes &&
                cp "$TEST_ROOT/test.o" invalid-delay.a &&
-               cp "$TEST_ROOT/test.o" unfiltered
+               cp "$TEST_ROOT/test.o" unfiltered &&
                git add . &&
                git commit -m "test commit"
        ) &&