git-submodule: add "sync" command

[git.git] / builtin-merge-base.c

diff --git a/builtin-merge-base.c b/builtin-merge-base.c
index 0108e22adee8b4de922a2b00b514dd4d4cf23c55..b08da516e491e7089b1bb178e9a4b05c2ab36539 100644 (file)
--- a/builtin-merge-base.c
+++ b/builtin-merge-base.c
@@ -2,9 +2,11 @@
 #include "cache.h"
 #include "commit.h"
 
-static int show_merge_base(struct commit *rev1, struct commit *rev2, int show_all)
+static int show_merge_base(struct commit **rev, int rev_nr, int show_all)
 {
-       struct commit_list *result = get_merge_bases(rev1, rev2, 0);
+       struct commit_list *result;
+
+       result = get_merge_bases_many(rev[0], rev_nr - 1, rev + 1, 0);
 
        if (!result)
                return 1;
@@ -20,15 +22,29 @@ 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>...";
+
+static struct commit *get_commit_reference(const char *arg)
+{
+       unsigned char revkey[20];
+       struct commit *r;
+
+       if (get_sha1(arg, revkey))
+               die("Not a valid object name %s", arg);
+       r = lookup_commit_reference(revkey);
+       if (!r)
+               die("Not a valid commit name %s", arg);
+
+       return r;
+}
 
 int cmd_merge_base(int argc, const char **argv, const char *prefix)
 {
-       struct commit *rev1, *rev2;
-       unsigned char rev1key[20], rev2key[20];
+       struct commit **rev;
+       int rev_nr = 0;
        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];
@@ -38,15 +54,15 @@ int cmd_merge_base(int argc, const char **argv, const char *prefix)
                        usage(merge_base_usage);
                argc--; argv++;
        }
-       if (argc != 3)
+       if (argc < 3)
                usage(merge_base_usage);
-       if (get_sha1(argv[1], rev1key))
-               die("Not a valid object name %s", argv[1]);
-       if (get_sha1(argv[2], rev2key))
-               die("Not a valid object name %s", argv[2]);
-       rev1 = lookup_commit_reference(rev1key);
-       rev2 = lookup_commit_reference(rev2key);
-       if (!rev1 || !rev2)
-               return 1;
-       return show_merge_base(rev1, rev2, show_all);
+
+       rev = xmalloc((argc - 1) * sizeof(*rev));
+
+       do {
+               rev[rev_nr++] = get_commit_reference(argv[1]);
+               argc--; argv++;
+       } while (argc > 1);
+
+       return show_merge_base(rev, rev_nr, show_all);
 }