X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=tag.c;h=2b25fc0e1dc53234e38e8ed8fdc1cb99fa4fd84a;hb=623c8a1460125f66274f451691b3576b0d0f7a4c;hp=4041af2572a4427a03bc8955137b7d2211f9d770;hpb=5d6ccf5ce7f28e576a87f6c6f4f99fae90e06db6;p=git.git diff --git a/tag.c b/tag.c index 4041af25..2b25fc0e 100644 --- a/tag.c +++ b/tag.c @@ -28,6 +28,7 @@ int parse_tag_buffer(struct tag *item, void *data, unsigned long size) int typelen, taglen; unsigned char object[20]; const char *type_line, *tag_line, *sig_line; + char type[20]; if (item->object.parsed) return 0; @@ -38,10 +39,6 @@ int parse_tag_buffer(struct tag *item, void *data, unsigned long size) if (memcmp("object ", data, 7) || get_sha1_hex(data + 7, object)) return -1; - item->tagged = parse_object(object); - if (item->tagged) - add_ref(&item->object, item->tagged); - type_line = data + 48; if (memcmp("\ntype ", type_line-1, 6)) return -1; @@ -58,11 +55,17 @@ int parse_tag_buffer(struct tag *item, void *data, unsigned long size) typelen = tag_line - type_line - strlen("type \n"); if (typelen >= 20) return -1; + memcpy(type, type_line + 5, typelen); + type[typelen] = '\0'; taglen = sig_line - tag_line - strlen("tag \n"); item->tag = xmalloc(taglen + 1); memcpy(item->tag, tag_line + 4, taglen); item->tag[taglen] = '\0'; + item->tagged = lookup_object_type(object, type); + if (item->tagged) + add_ref(&item->object, item->tagged); + return 0; }