git-read-tree: simplify merge loops enormously

diff --git a/object.h b/object.h
index bc607fd55f6ce4e56ce87766369b5d4d55ec79af..cde8471b56eb351152c3532a2f669208b3eb13bb 100644 (file)
--- a/object.h
+++ b/object.h
@@ -9,19 +9,25 @@ struct object_list {
 struct object {
        unsigned parsed : 1;
        unsigned used : 1;
+       unsigned delta : 1;
        unsigned int flags;
        unsigned char sha1[20];
        const char *type;
        struct object_list *refs;
+       struct object_list *attached_deltas;
+       void *util;
 };
 
-int nr_objs;
-struct object **objs;
+extern int nr_objs;
+extern struct object **objs;
 
 struct object *lookup_object(unsigned char *sha1);
 
 void created_object(unsigned char *sha1, struct object *obj);
 
+/** Returns the object, having parsed it to find out what it is. **/
+struct object *parse_object(unsigned char *sha1);
+
 void add_ref(struct object *refer, struct object *target);
 
 void mark_reachable(struct object *obj, unsigned int mask);