refs: allow for_each_replace_ref to handle arbitrary repositories

diff --git a/replace_object.c b/replace_object.c
index b2405f602745b55673ea2e114c3489310fa0d823..adfed789014bfe88b8a376983a77095c4622e852 100644 (file)
--- a/replace_object.c
+++ b/replace_object.c
@@ -31,7 +31,9 @@ static int register_replace_ref(const char *refname,
        return 0;
 }
 
-static void prepare_replace_object(void)
+#define prepare_replace_object(r) \
+       prepare_replace_object_##r()
+static void prepare_replace_object_the_repository(void)
 {
        if (the_repository->objects->replace_map)
                return;
@@ -40,7 +42,7 @@ static void prepare_replace_object(void)
                xmalloc(sizeof(*the_repository->objects->replace_map));
        oidmap_init(the_repository->objects->replace_map, 0);
 
-       for_each_replace_ref(register_replace_ref, NULL);
+       for_each_replace_ref(the_repository, register_replace_ref, NULL);
 }
 
 /* We allow "recursive" replacement. Only within reason, though */
@@ -53,12 +55,12 @@ static void prepare_replace_object(void)
  * permanently-allocated value.  This function always respects replace
  * references, regardless of the value of check_replace_refs.
  */
-const struct object_id *do_lookup_replace_object(const struct object_id *oid)
+const struct object_id *do_lookup_replace_object_the_repository(const struct object_id *oid)
 {
        int depth = MAXREPLACEDEPTH;
        const struct object_id *cur = oid;
 
-       prepare_replace_object();
+       prepare_replace_object(the_repository);
 
        /* Try to recursively replace the object */
        while (depth-- > 0) {