Merge branch 'jk/gc-pre-detach-under-hook' into maint

diff --git a/t/t1305-config-include.sh b/t/t1305-config-include.sh
index 8fbc7a029f79b1fd9ffae2fa6183ebdd4bbbb923..933915ec06ec725f7cf6a9ed3e251f6ff2390f76 100755 (executable)
--- a/t/t1305-config-include.sh
+++ b/t/t1305-config-include.sh
@@ -218,6 +218,17 @@ test_expect_success 'conditional include, both unanchored, icase' '
        )
 '
 
+test_expect_success 'conditional include, early config reading' '
+       (
+               cd foo &&
+               echo "[includeIf \"gitdir:foo/\"]path=bar6" >>.git/config &&
+               echo "[test]six=6" >.git/bar6 &&
+               echo 6 >expect &&
+               test-config read_early_config test.six >actual &&
+               test_cmp expect actual
+       )
+'
+
 test_expect_success SYMLINKS 'conditional include, set up symlinked $HOME' '
        mkdir real-home &&
        ln -s real-home home &&