summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--blob.c20
-rw-r--r--blob.h2
2 files changed, 21 insertions, 1 deletions
diff --git a/blob.c b/blob.c
index 3d99b93f02..d4af4a3094 100644
--- a/blob.c
+++ b/blob.c
@@ -14,10 +14,28 @@ struct blob *lookup_blob(unsigned char *sha1)
ret->object.type = blob_type;
return ret;
}
- if (obj->parsed && obj->type != blob_type) {
+ if (obj->type != blob_type) {
error("Object %s is a %s, not a blob",
sha1_to_hex(sha1), obj->type);
return NULL;
}
return (struct blob *) obj;
}
+
+int parse_blob(struct blob *item)
+{
+ char type[20];
+ void *buffer;
+ unsigned long size;
+ if (item->object.parsed)
+ return 0;
+ item->object.parsed = 1;
+ buffer = read_sha1_file(item->object.sha1, type, &size);
+ if (!buffer)
+ return error("Could not read %s",
+ sha1_to_hex(item->object.sha1));
+ if (strcmp(type, blob_type))
+ return error("Object %s not a blob",
+ sha1_to_hex(item->object.sha1));
+ return 0;
+}
diff --git a/blob.h b/blob.h
index 5cbf6d65ee..4afad0f067 100644
--- a/blob.h
+++ b/blob.h
@@ -11,4 +11,6 @@ struct blob {
struct blob *lookup_blob(unsigned char *sha1);
+int parse_blob(struct blob *item);
+
#endif /* BLOB_H */