Merge branch 'fixes'

diff --git a/object.h b/object.h
index d82c7c454bfc64e75b74f03c2d34d3f7e778a0f1..6accda33d8c8d6b8ef33a4df50bf350d9f088dc6 100644 (file)
--- a/object.h
+++ b/object.h
@@ -17,6 +17,7 @@ struct object {
        void *util;
 };
 
+extern int track_object_refs;
 extern int nr_objs;
 extern struct object **objs;
 
@@ -31,8 +32,21 @@ void created_object(const unsigned char *sha1, struct object *obj);
 /** Returns the object, having parsed it to find out what it is. **/
 struct object *parse_object(const unsigned char *sha1);
 
+/** Returns the object, with potentially excess memory allocated. **/
+struct object *lookup_unknown_object(const unsigned  char *sha1);
+
 void add_ref(struct object *refer, struct object *target);
 
 void mark_reachable(struct object *obj, unsigned int mask);
 
+struct object_list *object_list_insert(struct object *item, 
+                                      struct object_list **list_p);
+
+void object_list_append(struct object *item,
+                       struct object_list **list_p);
+
+unsigned object_list_length(struct object_list *list);
+
+int object_list_contains(struct object_list *list, struct object *obj);
+
 #endif /* OBJECT_H */