replace-object: allow lookup_replace_object to handle arbitrary repositories
Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stefan Beller committed
Apr 11, 2018 at 17:21 UTC
90e777f1e20dd6bdc022d5720a9169ea2205d9ad
1 file changed
+5
-5
replace-object.h
+5
-5
@@ -23,14 +23,14 @@ extern const struct object_id *do_lookup_replace_object(struct repository *r,
23
* either sha1 or a pointer to a permanently-allocated value. When
24
* object replacement is suppressed, always return sha1.
25
*/
26
-#define lookup_replace_object(r, s) lookup_replace_object_##r(s)
27
-static inline const struct object_id *lookup_replace_object_the_repository(const struct object_id *oid)
26
+static inline const struct object_id *lookup_replace_object(struct repository *r,
27
+ const struct object_id *oid)
28
{
29
if (!check_replace_refs ||
30
- (the_repository->objects->replace_map &&
31
- the_repository->objects->replace_map->map.tablesize == 0))
30
+ (r->objects->replace_map &&
31
+ r->objects->replace_map->map.tablesize == 0))
32
return oid;
33
- return do_lookup_replace_object(the_repository, oid);
33
+ return do_lookup_replace_object(r, oid);
34
}
35
36
#endif /* REPLACE_OBJECT_H */