From 5982da9d2ce75d445cb2a74351c34efa07342ea2 Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Wed, 11 Apr 2018 17:21:16 -0700 Subject: [PATCH] replace-object: allow prepare_replace_object to handle arbitrary repositories Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- replace_object.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/replace_object.c b/replace_object.c index adfed78901..eae52c66f3 100644 --- a/replace_object.c +++ b/replace_object.c @@ -31,18 +31,16 @@ static int register_replace_ref(const char *refname, return 0; } -#define prepare_replace_object(r) \ - prepare_replace_object_##r() -static void prepare_replace_object_the_repository(void) +static void prepare_replace_object(struct repository *r) { - if (the_repository->objects->replace_map) + if (r->objects->replace_map) return; - the_repository->objects->replace_map = + r->objects->replace_map = xmalloc(sizeof(*the_repository->objects->replace_map)); - oidmap_init(the_repository->objects->replace_map, 0); + oidmap_init(r->objects->replace_map, 0); - for_each_replace_ref(the_repository, register_replace_ref, NULL); + for_each_replace_ref(r, register_replace_ref, NULL); } /* We allow "recursive" replacement. Only within reason, though */