grep: recurse in-process using 'struct repository'

diff --git a/tag.c b/tag.c
index dff251673ec2b3723262a0c5676c482529c29f62..47f60ae151c2cfd9855d1b6f1660ec2ba178bec3 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -66,7 +66,7 @@ struct object *deref_tag(struct object *o, const char *warn, int warnlen)
 {
        while (o && o->type == OBJ_TAG)
                if (((struct tag *)o)->tagged)
-                       o = parse_object(((struct tag *)o)->tagged->oid.hash);
+                       o = parse_object(&((struct tag *)o)->tagged->oid);
                else
                        o = NULL;
        if (!o && warn) {
@@ -80,7 +80,7 @@ struct object *deref_tag(struct object *o, const char *warn, int warnlen)
 struct object *deref_tag_noverify(struct object *o)
 {
        while (o && o->type == OBJ_TAG) {
-               o = parse_object(o->oid.hash);
+               o = parse_object(&o->oid);
                if (o && o->type == OBJ_TAG && ((struct tag *)o)->tagged)
                        o = ((struct tag *)o)->tagged;
                else
@@ -89,15 +89,15 @@ struct object *deref_tag_noverify(struct object *o)
        return o;
 }
 
-struct tag *lookup_tag(const unsigned char *sha1)
+struct tag *lookup_tag(const struct object_id *oid)
 {
-       struct object *obj = lookup_object(sha1);
+       struct object *obj = lookup_object(oid->hash);
        if (!obj)
-               return create_object(sha1, alloc_tag_node());
+               return create_object(oid->hash, alloc_tag_node());
        return object_as_type(obj, OBJ_TAG, 0);
 }
 
-static unsigned long parse_tag_date(const char *buf, const char *tail)
+static timestamp_t parse_tag_date(const char *buf, const char *tail)
 {
        const char *dateptr;
 
@@ -110,8 +110,8 @@ static unsigned long parse_tag_date(const char *buf, const char *tail)
                /* nada */;
        if (buf >= tail)
                return 0;
-       /* dateptr < buf && buf[-1] == '\n', so strtoul will stop at buf-1 */
-       return strtoul(dateptr, NULL, 10);
+       /* dateptr < buf && buf[-1] == '\n', so parsing will stop at buf-1 */
+       return parse_timestamp(dateptr, NULL, 10);
 }
 
 int parse_tag_buffer(struct tag *item, const void *data, unsigned long size)
@@ -144,11 +144,11 @@ int parse_tag_buffer(struct tag *item, const void *data, unsigned long size)
        if (!strcmp(type, blob_type)) {
                item->tagged = &lookup_blob(&oid)->object;
        } else if (!strcmp(type, tree_type)) {
-               item->tagged = &lookup_tree(oid.hash)->object;
+               item->tagged = &lookup_tree(&oid)->object;
        } else if (!strcmp(type, commit_type)) {
                item->tagged = &lookup_commit(&oid)->object;
        } else if (!strcmp(type, tag_type)) {
-               item->tagged = &lookup_tag(oid.hash)->object;
+               item->tagged = &lookup_tag(&oid)->object;
        } else {
                error("Unknown type %s", type);
                item->tagged = NULL;