summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Barkalow <barkalow@iabervon.org>2005-06-21 20:35:10 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-21 18:29:12 -0700
commit89e4202f9828c18f5db4db80a008a2a8a458855e (patch)
tree18d3bfddecf89de84930ddb66aedc37e9cbd56a7
parent9661c256400d1a17a27e014592f887359f74707e (diff)
downloadgit-89e4202f9828c18f5db4db80a008a2a8a458855e.tar.gz
[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>
-rw-r--r--object.c16
-rw-r--r--object.h4
-rw-r--r--tag.c11
3 files changed, 27 insertions, 4 deletions
diff --git a/object.c b/object.c
index 5e83788570..21f872ee16 100644
--- a/object.c
+++ b/object.c
@@ -98,6 +98,22 @@ void mark_reachable(struct object *obj, unsigned int mask)
}
}
+struct object *lookup_object_type(const unsigned char *sha1, const char *type)
+{
+ if (!strcmp(type, blob_type)) {
+ return &lookup_blob(sha1)->object;
+ } else if (!strcmp(type, tree_type)) {
+ return &lookup_tree(sha1)->object;
+ } else if (!strcmp(type, commit_type)) {
+ return &lookup_commit(sha1)->object;
+ } else if (!strcmp(type, tag_type)) {
+ return &lookup_tag(sha1)->object;
+ } else {
+ error("Unknown type %s", type);
+ return NULL;
+ }
+}
+
struct object *parse_object(const unsigned char *sha1)
{
unsigned long mapsize;
diff --git a/object.h b/object.h
index ca455d5711..1bd59ac6fc 100644
--- a/object.h
+++ b/object.h
@@ -21,8 +21,12 @@ struct object {
extern int nr_objs;
extern struct object **objs;
+/** Internal only **/
struct object *lookup_object(const unsigned char *sha1);
+/** Returns the object, having looked it up as being the given type. **/
+struct object *lookup_object_type(const unsigned char *sha1, const char *type);
+
void created_object(const unsigned char *sha1, struct object *obj);
/** Returns the object, having parsed it to find out what it is. **/
diff --git a/tag.c b/tag.c
index 4041af2572..2b25fc0e1d 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;
}