Merge branch 'rs/tar-tree' into next

diff --git a/cat-file.c b/cat-file.c
index 1a613f3ee5ab4197fe18355ae65f2c9226b348cf..761111eb0f1f3266fe6bd0e9e561ee3d3d6c21d4 100644 (file)
--- a/cat-file.c
+++ b/cat-file.c
@@ -100,6 +100,7 @@ int main(int argc, char **argv)
        int opt;
 
        setup_git_directory();
+       git_config(git_default_config);
        if (argc != 3 || get_sha1(argv[2], sha1))
                usage("git-cat-file [-t|-s|-e|-p|<type>] <sha1>");