X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=tag.c;h=2b25fc0e1dc53234e38e8ed8fdc1cb99fa4fd84a;hb=56b6ed8881f3504b686a254cccdb5aa1a1a9e925;hp=22deb243ad58b2c57fb8652fe2d08c571ee3e781;hpb=bd2c39f58f915af532b488c5bda753314f0db603;p=git.git

diff --git a/tag.c b/tag.c
index 22deb243..2b25fc0e 100644
--- a/tag.c
+++ b/tag.c
@@ -3,7 +3,7 @@
 
 const char *tag_type = "tag";
 
-struct tag *lookup_tag(unsigned char *sha1)
+struct tag *lookup_tag(const unsigned char *sha1)
 {
         struct object *obj = lookup_object(sha1);
         if (!obj) {
@@ -13,6 +13,8 @@ struct tag *lookup_tag(unsigned char *sha1)
                 ret->object.type = tag_type;
                 return ret;
         }
+	if (!obj->type)
+		obj->type = tag_type;
         if (obj->type != tag_type) {
                 error("Object %s is a %s, not a tree", 
                       sha1_to_hex(sha1), obj->type);
@@ -26,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;
@@ -36,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;
@@ -56,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;
 }