diff options
| author | René Scharfe <l.s.r@web.de> | 2025-12-28 19:10:51 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-12-29 22:02:54 +0900 |
| commit | 009fceeda26e12e2dbacd04eef47c62d4e206403 (patch) | |
| tree | 93eddb67d7e8cfedecc81fe312e0d075e585c250 | |
| parent | b6e4cc8c32850315323961659e553d1d14591f7f (diff) | |
| download | git-009fceeda26e12e2dbacd04eef47c62d4e206403.tar.gz git-009fceeda26e12e2dbacd04eef47c62d4e206403.zip | |
tag: stop using the_repository
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | tag.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -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); |
