X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-merge-base.c;h=bcf9395aafb475edd22459eaf05cf5e180ca9b8f;hb=4df0d7af6be27fe5b0ffef438ef0169607253f66;hp=0108e22adee8b4de922a2b00b514dd4d4cf23c55;hpb=c576304d512df18fa30b91bb3ac15478d5d4dfb1;p=git.git diff --git a/builtin-merge-base.c b/builtin-merge-base.c index 0108e22ad..bcf9395aa 100644 --- a/builtin-merge-base.c +++ b/builtin-merge-base.c @@ -28,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];