summaryrefslogtreecommitdiff
path: root/builtin/tag.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-29 19:59:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-29 19:59:09 (GMT)
commitb559121e3ce56f221280314e4c5f1bdb75d4c32e (patch)
tree63cf61a5fd61bee800f892e18d8403e0ed30c287 /builtin/tag.c
parentf9dd74134ad98c80f36d2cf57cd368f5efc8df08 (diff)
parentbef234b09e5c3b2f63429fb49aff983f6f617f22 (diff)
downloadgit-b559121e3ce56f221280314e4c5f1bdb75d4c32e.zip
git-b559121e3ce56f221280314e4c5f1bdb75d4c32e.tar.gz
git-b559121e3ce56f221280314e4c5f1bdb75d4c32e.tar.bz2
Merge branch 'st/verify-tag'
Unify internal logic between "git tag -v" and "git verify-tag" commands by making one directly call into the other. * st/verify-tag: tag -v: verify directly rather than exec-ing verify-tag verify-tag: move tag verification code to tag.c verify-tag: prepare verify_tag for libification verify-tag: update variable name and type t7030: test verifying multiple tags builtin/verify-tag.c: ignore SIGPIPE in gpg-interface
Diffstat (limited to 'builtin/tag.c')
-rw-r--r--builtin/tag.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/builtin/tag.c b/builtin/tag.c
index 528a1ba..50e4ae5 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -105,13 +105,7 @@ 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[] = {"verify-tag",
- "-v", "SHA1_HEX", NULL};
- argv_verify_tag[2] = sha1_to_hex(sha1);
-
- if (run_command_v_opt(argv_verify_tag, RUN_GIT_CMD))
- return error(_("could not verify the tag '%s'"), name);
- return 0;
+ return gpg_verify_tag(sha1, name, GPG_VERIFY_VERBOSE);
}
static int do_sign(struct strbuf *buffer)