Fix "Do not ignore a detected patchfile brokenness."

[git.git] / merge-base.c

diff --git a/merge-base.c b/merge-base.c
index 12ebb95fba51ee9bba9767b25c999bd3de9ebd94..009caf804b43fdd644ff08991d55d0e417fd34d8 100644 (file)
--- a/merge-base.c
+++ b/merge-base.c
@@ -2,71 +2,53 @@
 #include "cache.h"
 #include "commit.h"
 
-static struct commit *process_list(struct commit_list **list_p, int this_mark,
-                                  int other_mark)
-{
-       struct commit *item = (*list_p)->item;
-
-       if (item->object.flags & other_mark) {
-               return item;
-       } else {
-               pop_most_recent_commit(list_p, this_mark);
-       }
-       return NULL;
-}
+static int show_all;
 
-static struct commit *common_ancestor(struct commit *rev1, struct commit *rev2)
+static int merge_base(struct commit *rev1, struct commit *rev2)
 {
-       struct commit_list *rev1list = NULL;
-       struct commit_list *rev2list = NULL;
-
-       commit_list_insert(rev1, &rev1list);
-       rev1->object.flags |= 0x1;
-       commit_list_insert(rev2, &rev2list);
-       rev2->object.flags |= 0x2;
+       struct commit_list *result = get_merge_bases(rev1, rev2, 0);
 
-       parse_commit(rev1);
-       parse_commit(rev2);
+       if (!result)
+               return 1;
 
-       while (rev1list || rev2list) {
-               struct commit *ret;
-               if (!rev1list) {
-                       // process 2
-                       ret = process_list(&rev2list, 0x2, 0x1);
-               } else if (!rev2list) {
-                       // process 1
-                       ret = process_list(&rev1list, 0x1, 0x2);
-               } else if (rev1list->item->date < rev2list->item->date) {
-                       // process 2
-                       ret = process_list(&rev2list, 0x2, 0x1);
-               } else {
-                       // process 1
-                       ret = process_list(&rev1list, 0x1, 0x2);
-               }
-               if (ret) {
-                       free_commit_list(rev1list);
-                       free_commit_list(rev2list);
-                       return ret;
-               }
+       while (result) {
+               printf("%s\n", sha1_to_hex(result->item->object.sha1));
+               if (!show_all)
+                       return 0;
+               result = result->next;
        }
-       return NULL;
+
+       return 0;
 }
 
+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);
-       ret = common_ancestor(rev1, rev2);
-       if (!ret)
+       if (!rev1 || !rev2)
                return 1;
-       printf("%s\n", sha1_to_hex(ret->object.sha1));
-       return 0;
+       return merge_base(rev1, rev2);
 }