summaryrefslogtreecommitdiff
path: root/object.c
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2018-06-29 01:21:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-06-29 17:43:38 (GMT)
commitda14a7ff99e1d011192a1fe330dd3fddf8977dc3 (patch)
tree1e65afa27b386a73556aa57a1b06a90a35d54f86 /object.c
parent1268dfac1e98e973c63abb142551c64bba6a44ca (diff)
downloadgit-da14a7ff99e1d011192a1fe330dd3fddf8977dc3.zip
git-da14a7ff99e1d011192a1fe330dd3fddf8977dc3.tar.gz
git-da14a7ff99e1d011192a1fe330dd3fddf8977dc3.tar.bz2
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>
Diffstat (limited to 'object.c')
-rw-r--r--object.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/object.c b/object.c
index 4049190..fde816a 100644
--- a/object.c
+++ b/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);
}