builtin/verify-tag: add --format to verify-tag
Callers of verify-tag may want to cross-check the tagname from refs/tags with the tagname from the tag object header upon GPG verification. This is to avoid tag refs that point to an incorrect object. Add a --format parameter to git verify-tag to print the formatted tag object header in addition to or instead of the --verbose or --raw GPG verification output. Signed-off-by: Santiago Torres <santiago@nyu.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Santiago Torres committed
Jan 17, 2017 at 18:37 UTC
ff3c8c8f124b26559232857fd37b67a0dd99600d
2 files changed
+20
-4
Documentation/git-verify-tag.txt
+1
-1
@@ -8,7 +8,7 @@ git-verify-tag - Check the GPG signature of tags
8
SYNOPSIS
9
--------
10
[verse]
11
-'git verify-tag' <tag>...
11
+'git verify-tag' [--format=<format>] <tag>...
12
13
DESCRIPTION
14
-----------
builtin/verify-tag.c
+19
-3
@@ -12,9 +12,10 @@
12
#include <signal.h>
13
#include "parse-options.h"
14
#include "gpg-interface.h"
15
+#include "ref-filter.h"
16
17
static const char * const verify_tag_usage[] = {
17
- N_("git verify-tag [-v | --verbose] <tag>..."),
18
+ N_("git verify-tag [-v | --verbose] [--format=<format>] <tag>..."),
19
NULL
20
};
21
@@ -30,9 +31,11 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix)
31
{
32
int i = 1, verbose = 0, had_error = 0;
33
unsigned flags = 0;
34
+ char *fmt_pretty = NULL;
35
const struct option verify_tag_options[] = {
36
OPT__VERBOSE(&verbose, N_("print tag contents")),
37
OPT_BIT(0, "raw", &flags, N_("print raw gpg status output"), GPG_VERIFY_RAW),
38
+ OPT_STRING( 0 , "format", &fmt_pretty, N_("format"), N_("format to use for the output")),
39
OPT_END()
40
};
41
@@ -46,13 +49,26 @@ int cmd_verify_tag(int argc, const char **argv, const char *prefix)
49
if (verbose)
50
flags |= GPG_VERIFY_VERBOSE;
51
52
+ if (fmt_pretty) {
53
+ verify_ref_format(fmt_pretty);
54
+ flags |= GPG_VERIFY_OMIT_STATUS;
55
+ }
56
+
57
while (i < argc) {
58
unsigned char sha1[20];
59
const char *name = argv[i++];
52
- if (get_sha1(name, sha1))
60
+ if (get_sha1(name, sha1)) {
61
had_error = !!error("tag '%s' not found.", name);
54
- else if (gpg_verify_tag(sha1, name, flags))
62
+ continue;
63
+ }
64
+
65
+ if (gpg_verify_tag(sha1, name, flags)) {
66
had_error = 1;
67
+ continue;
68
+ }
69
+
70
+ if (fmt_pretty)
71
+ pretty_print_ref(name, sha1, fmt_pretty);
72
}
73
return had_error;
74
}