admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

builtin/verify-tag: stop using the_repository

Browse Source 
Remove the_repository global variable in favor of the repository
argument that gets passed in "builtin/verify-tag.c".

When `-h` is passed to the command outside a Git repository, the
`run_builtin()` will call the `cmd_verify_tag()` function with `repo` set
to NULL and then early in the function, `parse_options()` call will give
the options help and exit.

Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Usman Akinyemi <usmanakinyemi202@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Usman Akinyemi
2025-03-08 05:05:01 +05:30
committed by Junio C Hamano
parent f29f1990b5
commit 43a8391977
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/verify-tag.c
View File

@@ -5,7 +5,6 @@
* *
* Based on git-verify-tag.sh * Based on git-verify-tag.sh
*/ */
#define USE_THE_REPOSITORY_VARIABLE
#include "builtin.h" #include "builtin.h"
#include "config.h" #include "config.h"
#include "gettext.h" #include "gettext.h"
@@ -23,7 +22,7 @@ static const char * const verify_tag_usage[] = {
int cmd_verify_tag(int argc, int cmd_verify_tag(int argc,
const char **argv, const char **argv,
const char *prefix, const char *prefix,
struct repository *repo UNUSED) struct repository *repo)
{ {
int i = 1, verbose = 0, had_error = 0; int i = 1, verbose = 0, had_error = 0;
unsigned flags = 0; unsigned flags = 0;
@@ -35,7 +34,7 @@ int cmd_verify_tag(int argc,
OPT_END() OPT_END()
}; };
git_config(git_default_config, NULL); repo_config(repo, git_default_config, NULL);
argc = parse_options(argc, argv, prefix, verify_tag_options, argc = parse_options(argc, argv, prefix, verify_tag_options,
verify_tag_usage, PARSE_OPT_KEEP_ARGV0); verify_tag_usage, PARSE_OPT_KEEP_ARGV0);
@@ -56,7 +55,7 @@ int cmd_verify_tag(int argc,
struct object_id oid; struct object_id oid;
const char *name = argv[i++]; const char *name = argv[i++];
if (repo_get_oid(the_repository, name, &oid)) { if (repo_get_oid(repo, name, &oid)) {
had_error = !!error("tag '%s' not found.", name); had_error = !!error("tag '%s' not found.", name);
continue; continue;
} }

7
t/t7030-verify-tag.sh
View File

@@ -7,6 +7,13 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh . ./test-lib.sh
. "$TEST_DIRECTORY/lib-gpg.sh" . "$TEST_DIRECTORY/lib-gpg.sh"
test_expect_success GPG 'verify-tag does not crash with -h' '
test_expect_code 129 git verify-tag -h >usage &&
test_grep "[Uu]sage: git verify-tag " usage &&
test_expect_code 129 nongit git verify-tag -h >usage &&
test_grep "[Uu]sage: git verify-tag " usage
'
test_expect_success GPG 'create signed tags' ' test_expect_success GPG 'create signed tags' '
echo 1 >file && git add file && echo 1 >file && git add file &&
test_tick && git commit -m initial && test_tick && git commit -m initial &&