Merge branch 'cb/fetch-set-upstream'

diff --git a/t/t1309-early-config.sh b/t/t1309-early-config.sh
index 413642aa5672800d1b7be448bc97d175add07ee4..3a0de0ddaa553e82b7db8594f4c45489237fb7db 100755 (executable)
--- a/t/t1309-early-config.sh
+++ b/t/t1309-early-config.sh
@@ -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