Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/builtin-verify-pack.c b/builtin-verify-pack.c
index 7d39d9bcd178a65686d6757f8a89065d25f55b23..4e31c273f48e3983aaf99dc6525982d34b6fed06 100644 (file)
--- a/builtin-verify-pack.c
+++ b/builtin-verify-pack.c
@@ -55,6 +55,7 @@ int cmd_verify_pack(int argc, const char **argv, const char *prefix)
        int no_more_options = 0;
        int nothing_done = 1;
 
+       git_config(git_default_config);
        while (1 < argc) {
                if (!no_more_options && argv[1][0] == '-') {
                        if (!strcmp("-v", argv[1]))