Merge branch 'master'

diff --git a/ls-files.c b/ls-files.c
index f7653e7d32aa6fa72d9c0e3fb1ad618b9536538c..db2288aeee61bf64f30fdcc4b11e91c0cd3038a0 100644 (file)
--- a/ls-files.c
+++ b/ls-files.c
@@ -570,6 +570,7 @@ int main(int argc, const char **argv)
        prefix = setup_git_directory();
        if (prefix)
                prefix_offset = strlen(prefix);
+       git_config(git_default_config);
 
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];