Merge branch 'fixes'

diff --git a/object.c b/object.c
index c410e97c8f378bd6c680efa48c82c3d3f7907103..1fdebe012ba8a6db0b6eae443e40a7f74ae2d597 100644 (file)
--- a/object.c
+++ b/object.c
@@ -9,6 +9,8 @@ struct object **objs;
 int nr_objs;
 static int obj_allocs;
 
+int track_object_refs = 1;
+
 static int find_object(const unsigned char *sha1)
 {
        int first = 0, last = nr_objs;
@@ -67,9 +69,12 @@ void created_object(const unsigned char *sha1, struct object *obj)
 
 void add_ref(struct object *refer, struct object *target)
 {
-       struct object_list **pp = &refer->refs;
-       struct object_list *p;
-       
+       struct object_list **pp, *p;
+
+       if (!track_object_refs)
+               return;
+
+       pp = &refer->refs;
        while ((p = *pp) != NULL) {
                if (p->item == target)
                        return;
@@ -87,6 +92,8 @@ void mark_reachable(struct object *obj, unsigned int mask)
 {
        struct object_list *p = obj->refs;
 
+       if (!track_object_refs)
+               die("cannot do reachability with object refs turned off");
        /* If we've been here already, don't bother */
        if (obj->flags & mask)
                return;
@@ -99,7 +106,9 @@ void mark_reachable(struct object *obj, unsigned int mask)
 
 struct object *lookup_object_type(const unsigned char *sha1, const char *type)
 {
-       if (!strcmp(type, blob_type)) {
+       if (!type) {
+               return lookup_unknown_object(sha1);
+       } else if (!strcmp(type, blob_type)) {
                return &lookup_blob(sha1)->object;
        } else if (!strcmp(type, tree_type)) {
                return &lookup_tree(sha1)->object;
@@ -113,6 +122,27 @@ struct object *lookup_object_type(const unsigned char *sha1, const char *type)
        }
 }
 
+union any_object {
+       struct object object;
+       struct commit commit;
+       struct tree tree;
+       struct blob blob;
+       struct tag tag;
+};
+
+struct object *lookup_unknown_object(const unsigned char *sha1)
+{
+       struct object *obj = lookup_object(sha1);
+       if (!obj) {
+               union any_object *ret = xmalloc(sizeof(*ret));
+               memset(ret, 0, sizeof(*ret));
+               created_object(sha1, &ret->object);
+               ret->object.type = NULL;
+               return &ret->object;
+       }
+       return obj;
+}
+
 struct object *parse_object(const unsigned char *sha1)
 {
        unsigned long size;
@@ -150,3 +180,44 @@ struct object *parse_object(const unsigned char *sha1)
        }
        return NULL;
 }
+
+struct object_list *object_list_insert(struct object *item,
+                                      struct object_list **list_p)
+{
+       struct object_list *new_list = xmalloc(sizeof(struct object_list));
+        new_list->item = item;
+        new_list->next = *list_p;
+        *list_p = new_list;
+        return new_list;
+}
+
+void object_list_append(struct object *item,
+                       struct object_list **list_p)
+{
+       while (*list_p) {
+               list_p = &((*list_p)->next);
+       }
+       *list_p = xmalloc(sizeof(struct object_list));
+       (*list_p)->next = NULL;
+       (*list_p)->item = item;
+}
+
+unsigned object_list_length(struct object_list *list)
+{
+       unsigned ret = 0;
+       while (list) {
+               list = list->next;
+               ret++;
+       }
+       return ret;
+}
+
+int object_list_contains(struct object_list *list, struct object *obj)
+{
+       while (list) {
+               if (list->item == obj)
+                       return 1;
+               list = list->next;
+       }
+       return 0;
+}