From 1f2e7ceabcc1559e5b3e49df91036d3106f727f4 Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Wed, 11 Apr 2018 17:21:13 -0700 Subject: replace-object: add repository argument to lookup_replace_object Add a repository argument to allow callers of lookup_replace_object 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 Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- replace-object.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'replace-object.h') diff --git a/replace-object.h b/replace-object.h index ddeb0470bd..dff57bfa1e 100644 --- a/replace-object.h +++ b/replace-object.h @@ -23,7 +23,8 @@ extern const struct object_id *do_lookup_replace_object_the_repository(const str * either sha1 or a pointer to a permanently-allocated value. When * object replacement is suppressed, always return sha1. */ -static inline const struct object_id *lookup_replace_object(const struct object_id *oid) +#define lookup_replace_object(r, s) lookup_replace_object_##r(s) +static inline const struct object_id *lookup_replace_object_the_repository(const struct object_id *oid) { if (!check_replace_refs || (the_repository->objects->replace_map && -- cgit v1.3