Merge branch 'mh/packed-ref-store' into next

diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index eb3d83744ad11115b86d81af41ce2f6865104ff1..46f8e583c37da7d03d715ea5cb1a4ee5bbe0ca28 100755 (executable)
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -697,7 +697,7 @@ test_expect_success PERL 'invalid process filter must fail (and not hang!)' '
 
                cp "$TEST_ROOT/test.o" test.r &&
                test_must_fail git add . 2>git-stderr.log &&
-               grep "does not support filter protocol version" git-stderr.log
+               grep "expected git-filter-server" git-stderr.log
        )
 '