summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2018-06-29 03:22:08 +0200
committerJunio C Hamano <gitster@pobox.com>2018-06-29 19:43:39 +0200
commit17126cdf78dc7b8cbe6b35bc44cb74d8d0fb11ee (patch)
tree4a37e8c81a018c81a7f7bba180eb2e904686131c
parentobject: allow lookup_object to handle arbitrary repositories (diff)
downloadgit-17126cdf78dc7b8cbe6b35bc44cb74d8d0fb11ee.tar.xz
git-17126cdf78dc7b8cbe6b35bc44cb74d8d0fb11ee.zip
blob: allow lookup_blob to handle arbitrary repositories
Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--blob.c10
-rw-r--r--blob.h3
2 files changed, 6 insertions, 7 deletions
diff --git a/blob.c b/blob.c
index 17b9314f0a..342bdbb1bb 100644
--- a/blob.c
+++ b/blob.c
@@ -5,13 +5,13 @@
const char *blob_type = "blob";
-struct blob *lookup_blob_the_repository(const struct object_id *oid)
+struct blob *lookup_blob(struct repository *r, const struct object_id *oid)
{
- struct object *obj = lookup_object(the_repository, oid->hash);
+ struct object *obj = lookup_object(r, oid->hash);
if (!obj)
- return create_object(the_repository, oid->hash,
- alloc_blob_node(the_repository));
- return object_as_type(the_repository, obj, OBJ_BLOB, 0);
+ return create_object(r, oid->hash,
+ alloc_blob_node(r));
+ return object_as_type(r, obj, OBJ_BLOB, 0);
}
int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size)
diff --git a/blob.h b/blob.h
index 08bc34487a..1664872055 100644
--- a/blob.h
+++ b/blob.h
@@ -9,8 +9,7 @@ struct blob {
struct object object;
};
-#define lookup_blob(r, o) lookup_blob_##r(o)
-struct blob *lookup_blob_the_repository(const struct object_id *oid);
+struct blob *lookup_blob(struct repository *r, const struct object_id *oid);
int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size);