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>

diff --git a/blob.c b/blob.c
index 17b9314f0a0c81abc2643ae5478ebc83be057bc7..342bdbb1bbea78dced090b815cab5ff9bfed9cd9 100644 (file)
--- a/blob.c
+++ b/blob.c
@@ -5,13 +5,13 @@
 
 const char *blob_type = "blob";
 
 
 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)
        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)
 }
 
 int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size)

diff --git a/blob.h b/blob.h
index 08bc34487a07a956a45987310023b7f095a5a3e3..1664872055783557e1836dcc64bc2f51c20c5b4f 100644 (file)
--- a/blob.h
+++ b/blob.h
@@ -9,8 +9,7 @@ struct blob {
        struct object object;
 };
 
        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);
 
 
 int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size);