Sync with 2.12.5

diff --git a/t/helper/test-config.c b/t/helper/test-config.c
index 3c6d08cd095152cab9abeb038c1b4f82440c55cd..8e3ed6a76cb97831e85152af8e9da21d18ed2fc1 100644 (file)
--- a/t/helper/test-config.c
+++ b/t/helper/test-config.c
@@ -66,12 +66,30 @@ static int iterate_cb(const char *var, const char *value, void *data)
        return 0;
 }
 
+static int early_config_cb(const char *var, const char *value, void *vdata)
+{
+       const char *key = vdata;
+
+       if (!strcmp(key, var))
+               printf("%s\n", value);
+
+       return 0;
+}
+
 int cmd_main(int argc, const char **argv)
 {
        int i, val;
        const char *v;
        const struct string_list *strptr;
        struct config_set cs;
+
+       if (argc == 3 && !strcmp(argv[1], "read_early_config")) {
+               read_early_config(early_config_cb, (void *)argv[2]);
+               return 0;
+       }
+
+       setup_git_directory();
+
        git_configset_init(&cs);
 
        if (argc < 2) {