diff options
author | Stefan Beller <sbeller@google.com> | 2018-04-12 02:21:12 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-04-12 04:38:56 +0200 |
commit | 9dfe98a8b3fba6df799686a276a39db39761863f (patch) | |
tree | 41b51cf914d0d063fff83389a28b1f64297ae86c | |
parent | replace-object: add repository argument to prepare_replace_object (diff) | |
download | git-9dfe98a8b3fba6df799686a276a39db39761863f.tar.xz git-9dfe98a8b3fba6df799686a276a39db39761863f.zip |
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>
-rw-r--r-- | replace-object.h | 5 | ||||
-rw-r--r-- | replace_object.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/replace-object.h b/replace-object.h index dbc51265ec..ddeb0470bd 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 */ diff --git a/replace_object.c b/replace_object.c index 567d9da708..adfed78901 100644 --- a/replace_object.c +++ b/replace_object.c @@ -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; |