Merge branches 'jc/convert', 'jc/bigfile' and 'jc/replacing' into jc/streaming

diff --git a/t/t1302-repo-version.sh b/t/t1302-repo-version.sh
index a6bf1bf4d6182f0883ea858e28aa8a9b3dd79024..0e476624069a4ac4259f35b07f36bf0945bfe986 100755 (executable)
--- a/t/t1302-repo-version.sh
+++ b/t/t1302-repo-version.sh
@@ -39,7 +39,7 @@ test_expect_success 'gitdir selection on unsupported repo' '
        (
                cd test2 &&
                git config core.repositoryformatversion >../actual
-       )
+       ) &&
        test_cmp expect actual
 '