blob: add repository argument to lookup_blob
Add a repository argument to allow the callers of lookup_blob to be more specific about which repository to act on. This is a small mechanical change; it doesn't change the implementation to handle repositories other than the_repository yet. As with the previous commits, use a macro to catch callers passing a repository other than the_repository at compile time. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
1268dfac1e
commit
da14a7ff99
4
object.c
4
object.c
@ -193,7 +193,7 @@ struct object *parse_object_buffer_the_repository(const struct object_id *oid, e
|
||||
|
||||
obj = NULL;
|
||||
if (type == OBJ_BLOB) {
|
||||
struct blob *blob = lookup_blob(oid);
|
||||
struct blob *blob = lookup_blob(the_repository, oid);
|
||||
if (blob) {
|
||||
if (parse_blob_buffer(blob, buffer, size))
|
||||
return NULL;
|
||||
@ -266,7 +266,7 @@ struct object *parse_object_the_repository(const struct object_id *oid)
|
||||
error("sha1 mismatch %s", oid_to_hex(oid));
|
||||
return NULL;
|
||||
}
|
||||
parse_blob_buffer(lookup_blob(oid), NULL, 0);
|
||||
parse_blob_buffer(lookup_blob(the_repository, oid), NULL, 0);
|
||||
return lookup_object(the_repository, oid->hash);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user