replace-object: add repository argument to lookup_replace_object

Add a repository argument to allow callers of lookup_replace_object
to be more specific about which repository to handle. 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>

diff --git a/builtin/mktag.c b/builtin/mktag.c
index e3d20a77226ae560e6fd66e0051fef132c449e5a..82a6e860775f872a9145e32ee9d8f315b70ad2ea 100644 (file)
--- a/builtin/mktag.c
+++ b/builtin/mktag.c
@@ -25,7 +25,7 @@ static int verify_object(const struct object_id *oid, const char *expected_type)
        enum object_type type;
        unsigned long size;
        void *buffer = read_object_file(oid, &type, &size);
        enum object_type type;
        unsigned long size;
        void *buffer = read_object_file(oid, &type, &size);

-       const struct object_id *repl = lookup_replace_object(oid);
+       const struct object_id *repl = lookup_replace_object(the_repository, oid);

 
        if (buffer) {
                if (type == type_from_string(expected_type))
 
        if (buffer) {
                if (type == type_from_string(expected_type))

diff --git a/object.c b/object.c
index 998ec2a25f4c28cf65c7c007e4fde1c1c9073e63..66cffaf6e516f181fa391ddab125fdc16cc71cb5 100644 (file)
--- a/object.c
+++ b/object.c
@@ -247,7 +247,7 @@ struct object *parse_object(const struct object_id *oid)
        unsigned long size;
        enum object_type type;
        int eaten;
        unsigned long size;
        enum object_type type;
        int eaten;

-       const struct object_id *repl = lookup_replace_object(oid);
+       const struct object_id *repl = lookup_replace_object(the_repository, oid);

        void *buffer;
        struct object *obj;
 
        void *buffer;
        struct object *obj;
 

diff --git a/replace-object.h b/replace-object.h
index ddeb0470bd34737b891fed1535842a9a83bbe7cd..dff57bfa1e20aff152ce4a2acfd2b2c1db144015 100644 (file)
--- a/replace-object.h
+++ b/replace-object.h
@@ -23,7 +23,8 @@ extern const struct object_id *do_lookup_replace_object_the_repository(const str
  * either sha1 or a pointer to a permanently-allocated value.  When
  * object replacement is suppressed, always return sha1.
  */
  * either sha1 or a pointer to a permanently-allocated value.  When
  * object replacement is suppressed, always return sha1.
  */

-static inline const struct object_id *lookup_replace_object(const struct object_id *oid)
+#define lookup_replace_object(r, s) lookup_replace_object_##r(s)
+static inline const struct object_id *lookup_replace_object_the_repository(const struct object_id *oid)

 {
        if (!check_replace_refs ||
            (the_repository->objects->replace_map &&
 {
        if (!check_replace_refs ||
            (the_repository->objects->replace_map &&

diff --git a/sha1_file.c b/sha1_file.c
index 67698fc1afe525c122c983499553c9759605bcd9..64a5bd7d8788d7e94e28a70dcb34f35756234920 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1240,7 +1240,7 @@ int oid_object_info_extended(const struct object_id *oid, struct object_info *oi
        int already_retried = 0;
 
        if (flags & OBJECT_INFO_LOOKUP_REPLACE)
        int already_retried = 0;
 
        if (flags & OBJECT_INFO_LOOKUP_REPLACE)

-               real = lookup_replace_object(oid);
+               real = lookup_replace_object(the_repository, oid);

 
        if (is_null_oid(real))
                return -1;
 
        if (is_null_oid(real))
                return -1;


@@ -1384,8 +1384,8 @@ void *read_object_file_extended(const struct object_id *oid,
        const struct packed_git *p;
        const char *path;
        struct stat st;
        const struct packed_git *p;
        const char *path;
        struct stat st;

-       const struct object_id *repl = lookup_replace ? lookup_replace_object(oid)
-                                                     : oid;
+       const struct object_id *repl = lookup_replace ?
+               lookup_replace_object(the_repository, oid) : oid;

 
        errno = 0;
        data = read_object(repl->hash, type, size);
 
        errno = 0;
        data = read_object(repl->hash, type, size);

diff --git a/streaming.c b/streaming.c
index a6e1162946958cabd8f1cb920ad8ed37cfd30508..cce7b17ea7b3c1328fc8969a42be7399f1706141 100644 (file)
--- a/streaming.c
+++ b/streaming.c
@@ -140,7 +140,7 @@ struct git_istream *open_istream(const struct object_id *oid,
 {
        struct git_istream *st;
        struct object_info oi = OBJECT_INFO_INIT;
 {
        struct git_istream *st;
        struct object_info oi = OBJECT_INFO_INIT;

-       const struct object_id *real = lookup_replace_object(oid);
+       const struct object_id *real = lookup_replace_object(the_repository, oid);

        enum input_source src = istream_source(real, type, &oi);
 
        if (src < 0)
        enum input_source src = istream_source(real, type, &oi);
 
        if (src < 0)