summaryrefslogtreecommitdiff
path: root/blob.c
diff options
context:
space:
mode:
authorDaniel Barkalow <barkalow@iabervon.org>2005-04-28 14:46:33 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-28 14:46:33 (GMT)
commita510bfaa8c001413f363e0d0b9c6cf15dbcbb7b3 (patch)
treebcb43fecd82fa6f851e266b7e3873973068d51f3 /blob.c
parent3a663fd9842aaa9e232ab43a811d11f1d7f0b7bc (diff)
downloadgit-a510bfaa8c001413f363e0d0b9c6cf15dbcbb7b3.zip
git-a510bfaa8c001413f363e0d0b9c6cf15dbcbb7b3.tar.gz
git-a510bfaa8c001413f363e0d0b9c6cf15dbcbb7b3.tar.bz2
[PATCH] Mark blobs as parsed when they're actually parsed
This eliminates the special case for blobs versus other types of objects. Now the scheme is entirely regular and I won't introduce stupid bugs. (And fsck-cache doesn't have to do the do-nothing parse) Signed-Off-By: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'blob.c')
-rw-r--r--blob.c20
1 files changed, 19 insertions, 1 deletions
diff --git a/blob.c b/blob.c
index 3d99b93..d4af4a3 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;
+}