builtin/verify-tag: stop using `the_repository`

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>

diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c
index f6b97048a57d37b6cd116385fe4a38b04b48344c..ed1c40338fd88ca59e4553c3a656542a9be9c880 100644 (file)
--- a/builtin/verify-tag.c
+++ b/builtin/verify-tag.c
@@ -5,7 +5,6 @@
  *
  * Based on git-verify-tag.sh
  */
-#define USE_THE_REPOSITORY_VARIABLE
 #include "builtin.h"
 #include "config.h"
 #include "gettext.h"
@@ -23,7 +22,7 @@ static const char * const verify_tag_usage[] = {
 int cmd_verify_tag(int argc,
                   const char **argv,
                   const char *prefix,
-                  struct repository *repo UNUSED)
+                  struct repository *repo)
 {
        int i = 1, verbose = 0, had_error = 0;
        unsigned flags = 0;
@@ -35,7 +34,7 @@ int cmd_verify_tag(int argc,
                OPT_END()
        };
 
-       git_config(git_default_config, NULL);
+       repo_config(repo, git_default_config, NULL);
 
        argc = parse_options(argc, argv, prefix, verify_tag_options,
                             verify_tag_usage, PARSE_OPT_KEEP_ARGV0);
@@ -56,7 +55,7 @@ int cmd_verify_tag(int argc,
                struct object_id oid;
                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);
                        continue;
                }

diff --git a/t/t7030-verify-tag.sh b/t/t7030-verify-tag.sh
index 6f526c37c2776e6288a1abe5860b6a9efed25183..2c147072c17f4cd0cd1b10831c79f875a8bfc079 100755 (executable)
--- a/t/t7030-verify-tag.sh
+++ b/t/t7030-verify-tag.sh
@@ -7,6 +7,13 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 . ./test-lib.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' '
        echo 1 >file && git add file &&
        test_tick && git commit -m initial &&