summaryrefslogtreecommitdiff
path: root/builtin/verify-tag.c
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2015-06-21 23:14:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-22 21:20:47 (GMT)
commitca194d50b84b53a0b711fef46d1a47657ec5da41 (patch)
treeb1218e292a895da641a1faa2c7b524de36ea039d /builtin/verify-tag.c
parent434060ec6d9bf50f095db901da3fb9b557e11df1 (diff)
downloadgit-ca194d50b84b53a0b711fef46d1a47657ec5da41.zip
git-ca194d50b84b53a0b711fef46d1a47657ec5da41.tar.gz
git-ca194d50b84b53a0b711fef46d1a47657ec5da41.tar.bz2
gpg: centralize printing signature buffers
The code to handle printing of signature data from a struct signature_check is very similar between verify-commit and verify-tag. Place this in a single function. verify-tag retains its special case behavior of printing the tag even when no valid signature is found. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/verify-tag.c')
-rw-r--r--builtin/verify-tag.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c
index 8750bef..d67e3db 100644
--- a/builtin/verify-tag.c
+++ b/builtin/verify-tag.c
@@ -27,14 +27,15 @@ static int run_gpg_verify(const char *buf, unsigned long size, int verbose)
memset(&sigc, 0, sizeof(sigc));
len = parse_signature(buf, size);
- if (verbose)
- write_in_full(1, buf, len);
- if (size == len)
+ if (size == len) {
+ if (verbose)
+ write_in_full(1, buf, len);
return error("no signature found");
+ }
ret = check_signature(buf, len, buf + len, size - len, &sigc);
- fputs(sigc.gpg_output, stderr);
+ print_signature_buffer(&sigc, verbose ? GPG_VERIFY_VERBOSE : 0);
signature_check_clear(&sigc);
return ret;