Skip to content

Commit 9dfe98a

Browse files
stefanbellergitster
authored andcommitted
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 <[email protected]> Signed-off-by: Stefan Beller <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent fe6d34d commit 9dfe98a

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

replace-object.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ struct replace_object {
1414
* This internal function is only declared here for the benefit of
1515
* lookup_replace_object(). Please do not call it directly.
1616
*/
17-
extern const struct object_id *do_lookup_replace_object(const struct object_id *oid);
17+
#define do_lookup_replace_object(r, s) do_lookup_replace_object_##r(s)
18+
extern const struct object_id *do_lookup_replace_object_the_repository(const struct object_id *oid);
1819

1920
/*
2021
* 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_
2829
(the_repository->objects->replace_map &&
2930
the_repository->objects->replace_map->map.tablesize == 0))
3031
return oid;
31-
return do_lookup_replace_object(oid);
32+
return do_lookup_replace_object(the_repository, oid);
3233
}
3334

3435
#endif /* REPLACE_OBJECT_H */

replace_object.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ static void prepare_replace_object_the_repository(void)
5555
* permanently-allocated value. This function always respects replace
5656
* references, regardless of the value of check_replace_refs.
5757
*/
58-
const struct object_id *do_lookup_replace_object(const struct object_id *oid)
58+
const struct object_id *do_lookup_replace_object_the_repository(const struct object_id *oid)
5959
{
6060
int depth = MAXREPLACEDEPTH;
6161
const struct object_id *cur = oid;

0 commit comments

Comments
 (0)