Make "upload-pack" match git-fetch-pack usage

diff --git a/object.h b/object.h
index 464bb0a292c11515ecb074de37daa7fa5536d8e5..d82c7c454bfc64e75b74f03c2d34d3f7e778a0f1 100644 (file)
--- a/object.h
+++ b/object.h
@@ -4,28 +4,32 @@
 struct object_list {
        struct object *item;
        struct object_list *next;
+       const char *name;
 };
 
 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;
 extern struct object **objs;
 
-struct object *lookup_object(unsigned char *sha1);
+/** Internal only **/
+struct object *lookup_object(const unsigned char *sha1);
 
-void created_object(unsigned char *sha1, struct object *obj);
+/** Returns the object, having looked it up as being the given type. **/
+struct object *lookup_object_type(const unsigned char *sha1, const char *type);
+
+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(unsigned char *sha1);
+struct object *parse_object(const unsigned char *sha1);
 
 void add_ref(struct object *refer, struct object *target);