[PATCH] Fix git-rev-parse --default and --flags handling

diff --git a/object.h b/object.h
index d53a35a4d7321b5ec970103208ac576f9f722dff..5af530da5decf0abbfafeee041143c0acd0d600a 100644 (file)
--- a/object.h
+++ b/object.h
@@ -4,6 +4,7 @@
 struct object_list {
        struct object *item;
        struct object_list *next;
+       const char *name;
 };
 
 struct object {
@@ -13,20 +14,35 @@ struct object {
        unsigned char sha1[20];
        const char *type;
        struct object_list *refs;
+       void *util;
 };
 
-int nr_objs;
-struct object **objs;
+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);
+
+/** 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);
+
+unsigned object_list_length(struct object_list *list);
+
+int object_list_contains(struct object_list *list, struct object *obj);
+
 #endif /* OBJECT_H */