[PATCH 09/16] replace-object: add repository argument to prepare_replace_object
- From
Stefan Beller <sbeller@google.com>
- Date
- Apr 9, 2018, 22:45 UTC
- Message-ID
- <20180409224533.17764-10-sbeller@google.com>
- In-Reply-To
- <20180409224533.17764-1-sbeller@google.com>
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: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Stefan Beller <sbeller@google.com> --- replace-object.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/replace-object.c b/replace-object.c index 16a95ea416..567d9da708 100644 --- 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; @@ -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) {
-- 2.17.0.484.g0c8726318c-goog