Signed-off-by: Stefan Beller <sbeller@xxxxxxxxxx>
---
replace-object.c | 9 +++++----
replace-object.h | 3 +--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/replace-object.c b/replace-object.c
index d9250a7cf8..a6a34217d8 100644
--- a/replace-object.c
+++ b/replace-object.c
@@ -94,12 +94,13 @@ static void prepare_replace_object(struct repository *r)
* permanently-allocated value. This function always respects replace
* references, regardless of the value of check_replace_refs.
*/
-const unsigned char *do_lookup_replace_object_the_repository(const unsigned char *sha1)
+const unsigned char *do_lookup_replace_object(struct repository *r,
+ const unsigned char *sha1)
{
int pos, depth = MAXREPLACEDEPTH;
const unsigned char *cur = sha1;
- prepare_replace_object(the_repository);
+ prepare_replace_object(r);
/* Try to recursively replace the object */
do {
@@ -107,9 +108,9 @@ const unsigned char *do_lookup_replace_object_the_repository(const unsigned char
die("replace depth too high for object %s",
sha1_to_hex(sha1));
- pos = replace_object_pos(the_repository, cur);
+ pos = replace_object_pos(r, cur);
if (0 <= pos)
- cur = the_repository->objects.replacements.items[pos]->replacement;
+ cur = r->objects.replacements.items[pos]->replacement;
} while (0 <= pos);
return cur;
diff --git a/replace-object.h b/replace-object.h
index 8af730f5e3..67a433d5a5 100644
--- a/replace-object.h
+++ b/replace-object.h
@@ -13,8 +13,7 @@ struct replace_object {
* This internal function is only declared here for the benefit of
* lookup_replace_object(). Please do not call it directly.
*/
-#define do_lookup_replace_object(r, s) do_lookup_replace_object_##r(s)
-extern const unsigned char *do_lookup_replace_object_the_repository(const unsigned char *sha1);
+extern const unsigned char *do_lookup_replace_object(struct repository *r, const unsigned char *sha1);
/*
* If object sha1 should be replaced, return the replacement object's
--
2.15.1.433.g936d1b9894.dirty
