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 <jrnieder@gmail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefan Beller
2018-04-11 17:21:13 -07:00
committed by Junio C Hamano
parent 9dfe98a8b3
commit 1f2e7ceabc
5 changed files with 8 additions and 7 deletions

View File

@ -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 &&