path: root/replace-object.h
diff options
authorStefan Beller <>2018-04-12 00:21:12 (GMT)
committerJunio C Hamano <>2018-04-12 02:38:56 (GMT)
commit9dfe98a8b3fba6df799686a276a39db39761863f (patch)
tree41b51cf914d0d063fff83389a28b1f64297ae86c /replace-object.h
parentfe6d34d863a351034cbc7c756465f84dc64007ad (diff)
replace-object: add repository argument to do_lookup_replace_object
Add a repository argument to allow the do_lookup_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 <> Signed-off-by: Stefan Beller <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'replace-object.h')
1 files changed, 3 insertions, 2 deletions
diff --git a/replace-object.h b/replace-object.h
index dbc5126..ddeb047 100644
--- a/replace-object.h
+++ b/replace-object.h
@@ -14,7 +14,8 @@ struct replace_object {
* This internal function is only declared here for the benefit of
* lookup_replace_object(). Please do not call it directly.
-extern const struct object_id *do_lookup_replace_object(const struct object_id *oid);
+#define do_lookup_replace_object(r, s) do_lookup_replace_object_##r(s)
+extern const struct object_id *do_lookup_replace_object_the_repository(const struct object_id *oid);
* If object sha1 should be replaced, return the replacement object's
@@ -28,7 +29,7 @@ static inline const struct object_id *lookup_replace_object(const struct object_
(the_repository->objects->replace_map &&
the_repository->objects->replace_map->map.tablesize == 0))
return oid;
- return do_lookup_replace_object(oid);
+ return do_lookup_replace_object(the_repository, oid);
#endif /* REPLACE_OBJECT_H */