Move pack_refs() and friends into libgit

diff --git a/builtin-merge-base.c b/builtin-merge-base.c
index e35d362f2697ebc7e627f230283aedb8ed92857f..bcf9395aafb475edd22459eaf05cf5e180ca9b8f 100644 (file)
--- a/builtin-merge-base.c
+++ b/builtin-merge-base.c
@@ -1,3 +1,4 @@
+#include "builtin.h"
 #include "cache.h"
 #include "commit.h"
 
@@ -27,7 +28,7 @@ int cmd_merge_base(int argc, const char **argv, const char *prefix)
        unsigned char rev1key[20], rev2key[20];
        int show_all = 0;
 
-       git_config(git_default_config);
+       git_config(git_default_config, NULL);
 
        while (1 < argc && argv[1][0] == '-') {
                const char *arg = argv[1];