[PATCH 4/4] tag: stop using the_repository
- From
René Scharfe <l.s.r@web.de>
- Date
- Dec 28, 2025, 18:10 UTC
- Message-ID
- <20251228181051.68724-5-l.s.r@web.de>
- In-Reply-To
- <20251228181051.68724-1-l.s.r@web.de>
gpg_verify_tag() shows the passed in object name on error. Both callers provide one. It falls back to abbreviated hashes for future callers that pass in a NULL name. DEFAULT_ABBREV is default_abbrev, which in turn is a global variable that's populated by git_default_config() and only available with USE_THE_REPOSITORY_VARIABLE.
Don't let that hypothetical hold us back from getting rid of the_repository in tag.c. Fall back to full hashes, which are more appropriate for error messages anyway. This allows us to stop setting USE_THE_REPOSITORY_VARIABLE.
Signed-off-by: René Scharfe <l.s.r@web.de> --- tag.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/tag.c b/tag.c index 9daeaf2a78..2f12e51024 100644 --- a/tag.c +++ b/tag.c @@ -1,4 +1,3 @@ -#define USE_THE_REPOSITORY_VARIABLE #define DISABLE_SIGN_COMPARE_WARNINGS #include "git-compat-util.h" @@ -58,7 +57,7 @@ int gpg_verify_tag(struct repository *r, const struct object_id *oid, return error("%s: cannot verify a non-tag object of type %s.", name_to_report ? name_to_report : - repo_find_unique_abbrev(r, oid, DEFAULT_ABBREV), + oid_to_hex(oid), type_name(type)); buf = odb_read_object(r->objects, oid, &type, &size); @@ -66,7 +65,7 @@ int gpg_verify_tag(struct repository *r, const struct object_id *oid, return error("%s: unable to read file.", name_to_report ? name_to_report : - repo_find_unique_abbrev(r, oid, DEFAULT_ABBREV)); + oid_to_hex(oid)); ret = run_gpg_verify(buf, size, flags);
-- 2.52.0