Merge branch 'en/and-cascade-tests'

[git.git] / builtin / tag.c

diff --git a/builtin/tag.c b/builtin/tag.c
index 4ef1c4f508b0261e725c360e96f2b8cbed50e9ce..d1d7d8701db23dfa0db0fb3457f57826b7012d41 100644 (file)
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -147,11 +147,11 @@ static int delete_tag(const char *name, const char *ref,
 static int verify_tag(const char *name, const char *ref,
                                const unsigned char *sha1)
 {
-       const char *argv_verify_tag[] = {"git-verify-tag",
+       const char *argv_verify_tag[] = {"verify-tag",
                                        "-v", "SHA1_HEX", NULL};
        argv_verify_tag[2] = sha1_to_hex(sha1);
 
-       if (run_command_v_opt(argv_verify_tag, 0))
+       if (run_command_v_opt(argv_verify_tag, RUN_GIT_CMD))
                return error("could not verify the tag '%s'", name);
        return 0;
 }
@@ -390,7 +390,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
                OPT_BOOLEAN('s', NULL, &sign, "annotated and GPG-signed tag"),
                OPT_STRING('u', NULL, &keyid, "key-id",
                                        "use another key to sign the tag"),
-               OPT_BOOLEAN('f', "force", &force, "replace the tag if exists"),
+               OPT__FORCE(&force, "replace the tag if exists"),
 
                OPT_GROUP("Tag listing options"),
                {