Commit fe6d34d8 authored by Stefan Beller's avatar Stefan Beller Committed by Junio C Hamano

replace-object: add repository argument to prepare_replace_object

Add a repository argument to allow the prepare_replace_object caller
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: default avatarJonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Stefan Beller's avatarStefan Beller <sbeller@google.com>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent 60ce76d3
......@@ -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;
......@@ -58,7 +60,7 @@ const struct object_id *do_lookup_replace_object(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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment