diff options
| author | Stefan Beller <sbeller@google.com> | 2018-04-12 00:21:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-12 02:38:56 (GMT) |
| commit | 1f2e7ceabcc1559e5b3e49df91036d3106f727f4 (patch) | |
| tree | dc982c714ad7014a3eefb148dc0bd495d941adf8 /replace-object.h | |
| parent | 9dfe98a8b3fba6df799686a276a39db39761863f (diff) | |
| download | git-1f2e7ceabcc1559e5b3e49df91036d3106f727f4.zip git-1f2e7ceabcc1559e5b3e49df91036d3106f727f4.tar.gz git-1f2e7ceabcc1559e5b3e49df91036d3106f727f4.tar.bz2 | |
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>
Diffstat (limited to 'replace-object.h')
| -rw-r--r-- | replace-object.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/replace-object.h b/replace-object.h index ddeb047..dff57bf 100644 --- a/replace-object.h +++ b/replace-object.h @@ -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 && |