summaryrefslogtreecommitdiff
path: root/tag.c
diff options
context:
space:
mode:
authorDaniel Barkalow <barkalow@iabervon.org>2005-06-22 00:35:10 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-22 01:29:12 (GMT)
commit89e4202f9828c18f5db4db80a008a2a8a458855e (patch)
tree18d3bfddecf89de84930ddb66aedc37e9cbd56a7 /tag.c
parent9661c256400d1a17a27e014592f887359f74707e (diff)
downloadgit-89e4202f9828c18f5db4db80a008a2a8a458855e.zip
git-89e4202f9828c18f5db4db80a008a2a8a458855e.tar.gz
git-89e4202f9828c18f5db4db80a008a2a8a458855e.tar.bz2
[PATCH] Parse tags for absent objects
Handle parsing a tag for a non-present object. This adds a function to lookup an object with lookup_* for * in a string, so that it can get the right storage based on the "type" line in the tag. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'tag.c')
-rw-r--r--tag.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/tag.c b/tag.c
index 4041af2..2b25fc0 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;
}