packfile: add repository argument to unpack_entry

diff --git a/replace_object.c b/replace_object.c
index a757a5ebf2e506d4770f7ba60226b6dc09bc3dcd..246b98cd4f1e4d229109bbeb8ffe90731df43df0 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,23 +25,22 @@ 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;
 }
 
-static void prepare_replace_object(void)
+static void prepare_replace_object(struct repository *r)
 {
-       static int replace_object_prepared;
-
-       if (replace_object_prepared)
+       if (r->objects->replace_map)
                return;
 
-       for_each_replace_ref(register_replace_ref, NULL);
-       replace_object_prepared = 1;
-       if (!replace_map.map.tablesize)
-               check_replace_refs = 0;
+       r->objects->replace_map =
+               xmalloc(sizeof(*the_repository->objects->replace_map));
+       oidmap_init(r->objects->replace_map, 0);
+
+       for_each_replace_ref(r, register_replace_ref, NULL);
 }
 
 /* We allow "recursive" replacement. Only within reason, though */
@@ -58,16 +53,18 @@ 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(struct repository *r,
+                                                const struct object_id *oid)
 {
        int depth = MAXREPLACEDEPTH;
        const struct object_id *cur = oid;
 
-       prepare_replace_object();
+       prepare_replace_object(r);
 
        /* 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(r->objects->replace_map, cur);
                if (!repl_obj)
                        return cur;
                cur = &repl_obj->replacement;