config: work around bug with includeif:onbranch and early config

diff --git a/t/t6018-rev-list-glob.sh b/t/t6018-rev-list-glob.sh
index 7dc6cbdc421d83e6cd83823ef0c8b199fee6d19c..bb5aeac07f8341ed44bfe25aba6238a92e1fc9e7 100755 (executable)
--- a/t/t6018-rev-list-glob.sh
+++ b/t/t6018-rev-list-glob.sh
@@ -147,6 +147,18 @@ test_expect_success 'rev-parse accumulates multiple --exclude' '
        compare rev-parse "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
 '
 
+test_expect_success 'rev-parse --branches clears --exclude' '
+       compare rev-parse "--exclude=* --branches --branches" "--branches"
+'
+
+test_expect_success 'rev-parse --tags clears --exclude' '
+       compare rev-parse "--exclude=* --tags --tags" "--tags"
+'
+
+test_expect_success 'rev-parse --all clears --exclude' '
+       compare rev-parse "--exclude=* --all --all" "--all"
+'
+
 test_expect_success 'rev-parse --exclude=glob with --branches=glob' '
        compare rev-parse "--exclude=subspace-* --branches=sub*" "subspace/one subspace/two"
 '
@@ -309,7 +321,7 @@ test_expect_success 'rev-list accumulates multiple --exclude' '
        compare rev-list "--exclude=refs/remotes/* --exclude=refs/tags/* --all" --branches
 '
 
-test_expect_failure 'rev-list should succeed with empty output on empty stdin' '
+test_expect_success 'rev-list should succeed with empty output on empty stdin' '
        git rev-list --stdin </dev/null >actual &&
        test_must_be_empty actual
 '