More work on merging with git-read-tree..

diff --git a/object.h b/object.h
index d53a35a4d7321b5ec970103208ac576f9f722dff..464bb0a292c11515ecb074de37daa7fa5536d8e5 100644 (file)
--- a/object.h
+++ b/object.h
@@ -9,14 +9,16 @@ 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;
 };
 
-int nr_objs;
-struct object **objs;
+extern int nr_objs;
+extern struct object **objs;
 
 struct object *lookup_object(unsigned char *sha1);