Merge branch 'jc/unresolve' into next

diff --git a/merge-base.c b/merge-base.c
index 751c3c281b8803ccb83a9de99c3ab5d63039c377..07f5ab4d1c72afeac5e3f193cefe91801ee9a9c9 100644 (file)
--- a/merge-base.c
+++ b/merge-base.c
@@ -236,6 +236,9 @@ int main(int argc, char **argv)
        struct commit *rev1, *rev2;
        unsigned char rev1key[20], rev2key[20];
 
+       setup_git_directory();
+       git_config(git_default_config);
+
        while (1 < argc && argv[1][0] == '-') {
                char *arg = argv[1];
                if (!strcmp(arg, "-a") || !strcmp(arg, "--all"))