[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>
This commit is contained in:

committed by
Linus Torvalds

parent
9661c25640
commit
89e4202f98
11
tag.c
11
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;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user