Merge branch 'fm/shell-path-whitespace' into maint

diff --git a/test-submodule-config.c b/test-submodule-config.c
index f3c391860dd3745eb1082bf499e7759f8da9cd24..dab8c27768160d4cfa61c41a95004eb7a8a336b6 100644 (file)
--- a/test-submodule-config.c
+++ b/test-submodule-config.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "submodule-config.h"
+#include "submodule.h"
 
 static void die_usage(int argc, char **argv, const char *msg)
 {
@@ -8,6 +9,11 @@ static void die_usage(int argc, char **argv, const char *msg)
        exit(1);
 }
 
+static int git_test_config(const char *var, const char *value, void *cb)
+{
+       return parse_submodule_config_option(var, value);
+}
+
 int main(int argc, char **argv)
 {
        char **arg = argv;
@@ -29,6 +35,10 @@ int main(int argc, char **argv)
        if (my_argc % 2 != 0)
                die_usage(argc, argv, "Wrong number of arguments.");
 
+       setup_git_directory();
+       gitmodules_config();
+       git_config(git_test_config, NULL);
+
        while (*arg) {
                unsigned char commit_sha1[20];
                const struct submodule *submodule;