Imported Upstream version 2.25.0

[platform/upstream/git.git] / t / t1309-early-config.sh

diff --git a/t/t1309-early-config.sh b/t/t1309-early-config.sh
index 413642a..ebb8e1a 100755 (executable)
--- a/t/t1309-early-config.sh
+++ b/t/t1309-early-config.sh
@@ -29,7 +29,7 @@ test_expect_success 'ceiling' '
                cd sub &&
                test-tool config read_early_config early.config
        ) >output &&
-       test -z "$(cat output)"
+       test_must_be_empty output
 '
 
 test_expect_success 'ceiling #2' '
@@ -89,4 +89,14 @@ test_expect_failure 'ignore .git/ with invalid config' '
        test_with_config "["
 '
 
+test_expect_success 'early config and onbranch' '
+       echo "[broken" >broken &&
+       test_with_config "[includeif \"onbranch:master\"]path=../broken"
+'
+
+test_expect_success 'onbranch config outside of git repo' '
+       test_config_global includeIf.onbranch:master.path non-existent &&
+       nongit git help
+'
+
 test_done