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

Convert remaining callers of lookup_blob to object_id

Browse Source 
All but a few callers of lookup_blob have been converted to struct
object_id.  Introduce a temporary, which will be removed later, into
parse_object to ease the transition, and convert the remaining callers
so that we can update lookup_blob to take struct object_id *.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson
2017-05-06 22:10:13 +00:00
committed by Junio C Hamano
parent 834bc47b42
commit 3e9309815d
3 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
object.c
View File

@ -190,7 +190,7 @@ struct object *parse_object_buffer(const unsigned char *sha1, enum object_type t
obj = NULL;
if (type == OBJ_BLOB) {
struct blob *blob = lookup_blob(sha1);
struct blob *blob = lookup_blob(oid.hash);
if (blob) {
if (parse_blob_buffer(blob, buffer, size))
return NULL;
@ -251,8 +251,11 @@ struct object *parse_object(const unsigned char *sha1)
const unsigned char *repl = lookup_replace_object(sha1);
void *buffer;
struct object *obj;
struct object_id oid;
obj = lookup_object(sha1);
hashcpy(oid.hash, sha1);
obj = lookup_object(oid.hash);
if (obj && obj->parsed)
return obj;
@ -263,7 +266,7 @@ struct object *parse_object(const unsigned char *sha1)
error("sha1 mismatch %s", sha1_to_hex(repl));
return NULL;
}
parse_blob_buffer(lookup_blob(sha1), NULL, 0);
parse_blob_buffer(lookup_blob(oid.hash), NULL, 0);
return lookup_object(sha1);
}