From: Santiago Torres <santiago@xxxxxxx>
The current implementation of git-verify-tag omits the gpg output when
the --format flag is passed. This may not be useful to users that want
to see the gpg output *and* --format the output of git verify-tag.
Instead, respect the --raw flag or the default gpg output.
Signed-off-by: Santiago Torres <santiago@xxxxxxx>
---
builtin/verify-tag.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c
index 6fa04b751a..262e73cb45 100644
--- a/builtin/verify-tag.c
+++ b/builtin/verify-tag.c
@@ -47,15 +47,13 @@ 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)
+ if (verbose && !format.format)
flags |= GPG_VERIFY_VERBOSE;
- if (format.format) {
+ if (format.format)
if (verify_ref_format(&format))
usage_with_options(verify_tag_usage,
verify_tag_options);
- flags |= GPG_VERIFY_OMIT_STATUS;
- }
while (i < argc) {
struct object_id oid;
--
2.21.0
