git-pack-objects: mark the delta packing with a 'D'.

diff --git a/merge-base.c b/merge-base.c
index ac1153bc5646cb2d515ff206b759f4a79e90273a..12ebb95fba51ee9bba9767b25c999bd3de9ebd94 100644 (file)
--- a/merge-base.c
+++ b/merge-base.c
@@ -5,67 +5,47 @@
 static struct commit *process_list(struct commit_list **list_p, int this_mark,
                                   int other_mark)
 {
-       struct commit_list *parent, *temp;
-       struct commit_list *posn = *list_p;
-       *list_p = NULL;
-       while (posn) {
-               parse_commit(posn->item);
-               if (posn->item->object.flags & this_mark) {
-                       /*
-                         printf("%d already seen %s %x\n",
-                         this_mark
-                         sha1_to_hex(posn->parent->sha1),
-                         posn->parent->flags);
-                       */
-                       /* do nothing; this indicates that this side
-                        * split and reformed, and we only need to
-                        * mark it once.
-                        */
-               } else if (posn->item->object.flags & other_mark) {
-                       return posn->item;
-               } else {
-                       /*
-                         printf("%d based on %s\n",
-                         this_mark,
-                         sha1_to_hex(posn->parent->sha1));
-                       */
-                       posn->item->object.flags |= this_mark;
-                       
-                       parent = posn->item->parents;
-                       while (parent) {
-                               temp = malloc(sizeof(struct commit_list));
-                               temp->next = *list_p;
-                               temp->item = parent->item;
-                               *list_p = temp;
-                               parent = parent->next;
-                       }
-               }
-               posn = posn->next;
+       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;
 }
 
-struct commit *common_ancestor(struct commit *rev1, struct commit *rev2)
+static struct commit *common_ancestor(struct commit *rev1, struct commit *rev2)
 {
-       struct commit_list *rev1list = malloc(sizeof(struct commit_list));
-       struct commit_list *rev2list = malloc(sizeof(struct commit_list));
+       struct commit_list *rev1list = NULL;
+       struct commit_list *rev2list = NULL;
 
-       rev1list->item = rev1;
-       rev1list->next = NULL;
+       commit_list_insert(rev1, &rev1list);
+       rev1->object.flags |= 0x1;
+       commit_list_insert(rev2, &rev2list);
+       rev2->object.flags |= 0x2;
 
-       rev2list->item = rev2;
-       rev2list->next = NULL;
+       parse_commit(rev1);
+       parse_commit(rev2);
 
        while (rev1list || rev2list) {
                struct commit *ret;
-               ret = process_list(&rev1list, 0x1, 0x2);
-               if (ret) {
-                       /* XXXX free lists */
-                       return 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);
                }
-               ret = process_list(&rev2list, 0x2, 0x1);
                if (ret) {
-                       /* XXXX free lists */
+                       free_commit_list(rev1list);
+                       free_commit_list(rev2list);
                        return ret;
                }
        }
@@ -78,12 +58,12 @@ int main(int argc, char **argv)
        unsigned char rev1key[20], rev2key[20];
 
        if (argc != 3 ||
-           get_sha1_hex(argv[1], rev1key) ||
-           get_sha1_hex(argv[2], rev2key)) {
-               usage("merge-base <commit-id> <commit-id>");
+           get_sha1(argv[1], rev1key) ||
+           get_sha1(argv[2], rev2key)) {
+               usage("git-merge-base <commit-id> <commit-id>");
        }
-       rev1 = lookup_commit(rev1key);
-       rev2 = lookup_commit(rev2key);
+       rev1 = lookup_commit_reference(rev1key);
+       rev2 = lookup_commit_reference(rev2key);
        ret = common_ancestor(rev1, rev2);
        if (!ret)
                return 1;