Merge branch 'ab/cond-skip-tests' into maint

diff --git a/t/t1302-repo-version.sh b/t/t1302-repo-version.sh
index f859809b3613dc8fa67f1acb1f8127ee9bbd4391..ce4cff13bbced58add641a463321f36673121fd7 100755 (executable)
--- a/t/t1302-repo-version.sh
+++ b/t/t1302-repo-version.sh
@@ -32,9 +32,7 @@ test_expect_success 'gitdir selection on normal repos' '
 
 test_expect_success 'gitdir selection on unsupported repo' '
        # Make sure it would stop at test2, not trash
-       echo 99 >expect &&
-       git -C test2 config core.repositoryformatversion >actual &&
-       test_cmp expect actual
+       test_expect_code 1 git -C test2 config core.repositoryformatversion >actual
 '
 
 test_expect_success 'gitdir not required mode' '