subtree test: simplify preparation of expected results

diff --git a/replace-object.h b/replace-object.h
index f05354c8616748964cdb3456f93f71ac06fe19c4..f996de3d62c6aaa9d30792e5347613ff1f63fbe0 100644 (file)
--- a/replace-object.h
+++ b/replace-object.h
@@ -23,14 +23,14 @@ extern const struct object_id *do_lookup_replace_object(struct repository *r,
  * either sha1 or a pointer to a permanently-allocated value.  When
  * object replacement is suppressed, always return sha1.
  */
-#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)
+static inline const struct object_id *lookup_replace_object(struct repository *r,
+                                                           const struct object_id *oid)
 {
        if (!check_replace_refs ||
-           (the_repository->objects->replace_map &&
-            the_repository->objects->replace_map->map.tablesize == 0))
+           (r->objects->replace_map &&
+            r->objects->replace_map->map.tablesize == 0))
                return oid;
-       return do_lookup_replace_object(the_repository, oid);
+       return do_lookup_replace_object(r, oid);
 }
 
 #endif /* REPLACE_OBJECT_H */