mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] Mark blobs as parsed when they're actually parsed

Browse Source 
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>
This commit is contained in:
Daniel Barkalow 2005-04-28 07:46:33 -07:00 committed by Linus Torvalds
parent 3a663fd984
commit a510bfaa8c
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
blob.c
View File

@ -14,10 +14,28 @@ struct blob *lookup_blob(unsigned char *sha1)
ret->object.type = blob_type; ret->object.type = blob_type;
return ret; return ret;
} }
if (obj->parsed && obj->type != blob_type) { if (obj->type != blob_type) {
error("Object %s is a %s, not a blob", error("Object %s is a %s, not a blob",
sha1_to_hex(sha1), obj->type); sha1_to_hex(sha1), obj->type);
return NULL; return NULL;
} }
return (struct blob *) obj; 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;
}

2
blob.h
View File

@ -11,4 +11,6 @@ struct blob {
struct blob *lookup_blob(unsigned char *sha1); struct blob *lookup_blob(unsigned char *sha1);
int parse_blob(struct blob *item);
#endif /* BLOB_H */ #endif /* BLOB_H */