builtin-clone: rewrite guess_dir_name()

diff --git a/builtin-merge-base.c b/builtin-merge-base.c
index 0108e22adee8b4de922a2b00b514dd4d4cf23c55..1cb2925d2f3dc6dc1a38c31bcec1c10ae8146a22 100644 (file)
--- a/builtin-merge-base.c
+++ b/builtin-merge-base.c
@@ -20,7 +20,7 @@ static int show_merge_base(struct commit *rev1, struct commit *rev2, int show_al
 }
 
 static const char merge_base_usage[] =
-"git-merge-base [--all] <commit-id> <commit-id>";
+"git merge-base [--all] <commit-id> <commit-id>";
 
 int cmd_merge_base(int argc, const char **argv, const char *prefix)
 {
@@ -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];