Merge branch 'jn/web'

[git.git] / merge-base.c

diff --git a/merge-base.c b/merge-base.c
index 18d81d08a5147acd09b6f1e2f57f647ea5bf1fc5..59f723f4047f831165b8d52ac13def398e663ac3 100644 (file)
--- a/merge-base.c
+++ b/merge-base.c
@@ -2,84 +2,53 @@
 #include "cache.h"
 #include "commit.h"
 
-#define PARENT1 1
-#define PARENT2 2
-#define UNINTERESTING 4
+static int show_all = 0;
 
-static int interesting(struct commit_list *list)
+static int merge_base(struct commit *rev1, struct commit *rev2)
 {
-       while (list) {
-               struct commit *commit = list->item;
-               list = list->next;
-               if (commit->object.flags & UNINTERESTING)
-                       continue;
+       struct commit_list *result = get_merge_bases(rev1, rev2, 0);
+
+       if (!result)
                return 1;
+
+       while (result) {
+               printf("%s\n", sha1_to_hex(result->item->object.sha1));
+               if (!show_all)
+                       return 0;
+               result = result->next;
        }
+
        return 0;
 }
 
-static struct commit *common_ancestor(struct commit *rev1, struct commit *rev2)
-{
-       struct commit_list *list = NULL;
-       struct commit_list *result = NULL;
-
-       if (rev1 == rev2)
-               return rev1;
-
-       parse_commit(rev1);
-       parse_commit(rev2);
-
-       rev1->object.flags |= 1;
-       rev2->object.flags |= 2;
-       insert_by_date(rev1, &list);
-       insert_by_date(rev2, &list);
-
-       while (interesting(list)) {
-               struct commit *commit = list->item;
-               struct commit_list *tmp = list, *parents;
-               int flags = commit->object.flags & 7;
-
-               list = list->next;
-               free(tmp);
-               if (flags == 3) {
-                       insert_by_date(commit, &result);
-
-                       /* Mark children of a found merge uninteresting */
-                       flags |= UNINTERESTING;
-               }
-               parents = commit->parents;
-               while (parents) {
-                       struct commit *p = parents->item;
-                       parents = parents->next;
-                       if ((p->object.flags & flags) == flags)
-                               continue;
-                       parse_commit(p);
-                       p->object.flags |= flags;
-                       insert_by_date(p, &list);
-               }
-       }
-       if (!result)
-               return NULL;
-       return result->item;
-}
+static const char merge_base_usage[] =
+"git-merge-base [--all] <commit-id> <commit-id>";
 
 int main(int argc, char **argv)
 {
-       struct commit *rev1, *rev2, *ret;
+       struct commit *rev1, *rev2;
        unsigned char rev1key[20], rev2key[20];
 
-       if (argc != 3 ||
-           get_sha1(argv[1], rev1key) ||
-           get_sha1(argv[2], rev2key)) {
-               usage("git-merge-base <commit-id> <commit-id>");
+       setup_git_directory();
+       git_config(git_default_config);
+
+       while (1 < argc && argv[1][0] == '-') {
+               char *arg = argv[1];
+               if (!strcmp(arg, "-a") || !strcmp(arg, "--all"))
+                       show_all = 1;
+               else
+                       usage(merge_base_usage);
+               argc--; argv++;
        }
+       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;
-       ret = common_ancestor(rev1, rev2);
-       if (!ret)
-               return 1;
-       printf("%s\n", sha1_to_hex(ret->object.sha1));
-       return 0;
+       return merge_base(rev1, rev2);
 }