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 <jrnieder@gmail.com> 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
9dfe98a8b3fba6df799686a276a39db39761863f
2 files changed
+4
-3
replace-object.h
+3
-2
@@ -14,7 +14,8 @@ struct replace_object {
14
* This internal function is only declared here for the benefit of
15
* lookup_replace_object(). Please do not call it directly.
16
*/
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);
19
20
/*
21
* 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_
29
(the_repository->objects->replace_map &&
30
the_repository->objects->replace_map->map.tablesize == 0))
31
return oid;
31
- return do_lookup_replace_object(oid);
32
+ return do_lookup_replace_object(the_repository, oid);
33
}
34
35
#endif /* REPLACE_OBJECT_H */
replace_object.c
+1
-1
@@ -55,7 +55,7 @@ static void prepare_replace_object_the_repository(void)
55
* permanently-allocated value. This function always respects replace
56
* references, regardless of the value of check_replace_refs.
57
*/
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)
59
{
60
int depth = MAXREPLACEDEPTH;
61
const struct object_id *cur = oid;