git-read-tree: simplify merge loops enormously

diff --git a/object.h b/object.h
index 09700d376077b2d6136620faf6efb77ee679deeb..cde8471b56eb351152c3532a2f669208b3eb13bb 100644 (file)
--- a/object.h
+++ b/object.h
@@ -9,10 +9,13 @@ 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;
 };
 
 extern int nr_objs;