X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-merge-base.c;h=bcf9395aafb475edd22459eaf05cf5e180ca9b8f;hb=7ebd52aa0e58df6bac5f0f87a591da17eb3324a6;hp=e35d362f2697ebc7e627f230283aedb8ed92857f;hpb=610f043bb378d12f399f4e5692fb874e0a043b23;p=git.git

diff --git a/builtin-merge-base.c b/builtin-merge-base.c
index e35d362f2..bcf9395aa 100644
--- 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];