refs: add repository argument to get_main_ref_store

diff --git a/replace_object.c b/replace_object.c
index a757a5ebf2e506d4770f7ba60226b6dc09bc3dcd..b2405f602745b55673ea2e114c3489310fa0d823 100644 (file)
--- a/replace_object.c
+++ b/replace_object.c
@@ -1,15 +1,11 @@
 #include "cache.h"
 #include "oidmap.h"
+#include "object-store.h"
+#include "replace-object.h"
 #include "refs.h"
+#include "repository.h"
 #include "commit.h"
 
-struct replace_object {
-       struct oidmap_entry original;
-       struct object_id replacement;
-};
-
-static struct oidmap replace_map = OIDMAP_INIT;
-
 static int register_replace_ref(const char *refname,
                                const struct object_id *oid,
                                int flag, void *cb_data)
@@ -29,7 +25,7 @@ static int register_replace_ref(const char *refname,
        oidcpy(&repl_obj->replacement, oid);
 
        /* Register new object */
-       if (oidmap_put(&replace_map, repl_obj))
+       if (oidmap_put(the_repository->objects->replace_map, repl_obj))
                die("duplicate replace ref: %s", refname);
 
        return 0;
@@ -37,15 +33,14 @@ static int register_replace_ref(const char *refname,
 
 static void prepare_replace_object(void)
 {
-       static int replace_object_prepared;
-
-       if (replace_object_prepared)
+       if (the_repository->objects->replace_map)
                return;
 
+       the_repository->objects->replace_map =
+               xmalloc(sizeof(*the_repository->objects->replace_map));
+       oidmap_init(the_repository->objects->replace_map, 0);
+
        for_each_replace_ref(register_replace_ref, NULL);
-       replace_object_prepared = 1;
-       if (!replace_map.map.tablesize)
-               check_replace_refs = 0;
 }
 
 /* We allow "recursive" replacement. Only within reason, though */
@@ -67,7 +62,8 @@ const struct object_id *do_lookup_replace_object(const struct object_id *oid)
 
        /* Try to recursively replace the object */
        while (depth-- > 0) {
-               struct replace_object *repl_obj = oidmap_get(&replace_map, cur);
+               struct replace_object *repl_obj =
+                       oidmap_get(the_repository->objects->replace_map, cur);
                if (!repl_obj)
                        return cur;
                cur = &repl_obj->replacement;