[PATCH 121/194] sha1_file: allow read_object to handle arbitrary repositories

[Stefan Beller]

Signed-off-by: Stefan Beller <sbel...@google.com>
---
 sha1_file.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sha1_file.c b/sha1_file.c
index a5ad67143d..6164ba29c5 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1319,9 +1319,8 @@ int sha1_object_info(struct repository *r,
        return type;
 }
 
-#define read_object(r, s, t, sz) read_object_##r(s, t, sz)
-static void *read_object_the_repository(const unsigned char *sha1, enum 
object_type *type,
-                        unsigned long *size)
+static void *read_object(struct repository *r, const unsigned char *sha1,
+                        enum object_type *type, unsigned long *size)
 {
        struct object_info oi = OBJECT_INFO_INIT;
        void *content;
@@ -1329,7 +1328,7 @@ static void *read_object_the_repository(const unsigned 
char *sha1, enum object_t
        oi.sizep = size;
        oi.contentp = &content;
 
-       if (sha1_object_info_extended(the_repository, sha1, &oi, 0) < 0)
+       if (sha1_object_info_extended(r, sha1, &oi, 0) < 0)
                return NULL;
        return content;
 }
-- 
2.15.1.433.g936d1b9894.dirty