diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/verify-tag.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c index d67e3dbd10..00663f6a30 100644 --- a/builtin/verify-tag.c +++ b/builtin/verify-tag.c @@ -18,7 +18,7 @@ static const char * const verify_tag_usage[] = { NULL }; -static int run_gpg_verify(const char *buf, unsigned long size, int verbose) +static int run_gpg_verify(const char *buf, unsigned long size, unsigned flags) { struct signature_check sigc; int len; @@ -29,19 +29,19 @@ static int run_gpg_verify(const char *buf, unsigned long size, int verbose) len = parse_signature(buf, size); if (size == len) { - if (verbose) + if (flags & GPG_VERIFY_VERBOSE) write_in_full(1, buf, len); return error("no signature found"); } ret = check_signature(buf, len, buf + len, size - len, &sigc); - print_signature_buffer(&sigc, verbose ? GPG_VERIFY_VERBOSE : 0); + print_signature_buffer(&sigc, flags); signature_check_clear(&sigc); return ret; } -static int verify_tag(const char *name, int verbose) +static int verify_tag(const char *name, unsigned flags) { enum object_type type; unsigned char sha1[20]; @@ -61,7 +61,7 @@ static int verify_tag(const char *name, int verbose) if (!buf) return error("%s: unable to read file.", name); - ret = run_gpg_verify(buf, size, verbose); + ret = run_gpg_verify(buf, size, flags); free(buf); return ret; @@ -78,8 +78,10 @@ static int git_verify_tag_config(const char *var, const char *value, void *cb) int cmd_verify_tag(int argc, const char **argv, const char *prefix) { int i = 1, verbose = 0, had_error = 0; + unsigned flags = 0; const struct option verify_tag_options[] = { OPT__VERBOSE(&verbose, N_("print tag contents")), + OPT_BIT(0, "raw", &flags, N_("print raw gpg status output"), GPG_VERIFY_RAW), OPT_END() }; @@ -90,11 +92,14 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix) if (argc <= i) usage_with_options(verify_tag_usage, verify_tag_options); + if (verbose) + flags |= GPG_VERIFY_VERBOSE; + /* sometimes the program was terminated because this signal * was received in the process of writing the gpg input: */ signal(SIGPIPE, SIG_IGN); while (i < argc) - if (verify_tag(argv[i++], verbose)) + if (verify_tag(argv[i++], flags)) had_error = 1; return had_error; } |