зеркало из https://github.com/microsoft/git.git
[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>
This commit is contained in:
Родитель
3a663fd984
Коммит
a510bfaa8c
20
blob.c
20
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;
|
||||
}
|
||||
|
|
2
blob.h
2
blob.h
|
@ -11,4 +11,6 @@ struct blob {
|
|||
|
||||
struct blob *lookup_blob(unsigned char *sha1);
|
||||
|
||||
int parse_blob(struct blob *item);
|
||||
|
||||
#endif /* BLOB_H */
|
||||
|
|
Загрузка…
Ссылка в новой задаче