Commit 9dfe98a8 authored by Stefan Beller's avatar Stefan Beller Committed by Junio C Hamano

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: default avatarJonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Stefan Beller's avatarStefan Beller <sbeller@google.com>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent fe6d34d8
......@@ -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 */
......@@ -55,7 +55,7 @@ static void prepare_replace_object_the_repository(void)
* permanently-allocated value. This function always respects replace
* references, regardless of the value of check_replace_refs.
*/
const struct object_id *do_lookup_replace_object(const struct object_id *oid)
const struct object_id *do_lookup_replace_object_the_repository(const struct object_id *oid)
{
int depth = MAXREPLACEDEPTH;
const struct object_id *cur = oid;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment