diff options
author | Michael J Gruber <git@drmicha.warpmail.net> | 2016-10-12 15:04:15 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-10-12 10:41:59 -0700 |
commit | 661a1806819ca98c446f82b19e6c98fa174d33a4 (patch) | |
tree | fce87ad1b1ffffc6933ab25a667bb96167de4c8f /pretty.c | |
parent | 21f862b498925194f8f1ebe8203b7a7df756555b (diff) | |
download | git-661a1806819ca98c446f82b19e6c98fa174d33a4.tar.gz |
gpg-interface: use more status lettersmg/gpg-richer-status
According to gpg2's doc/DETAILS:
For each signature only one of the codes GOODSIG, BADSIG,
EXPSIG, EXPKEYSIG, REVKEYSIG or ERRSIG will be emitted.
gpg1 ("classic") behaves the same (although doc/DETAILS differs).
Currently, we parse gpg's status output for GOODSIG, BADSIG and
trust information and translate that into status codes G, B, U, N
for the %G? format specifier.
git-verify-* returns success in the GOODSIG case only. This is
somewhat in disagreement with gpg, which considers the first 5 of
the 6 above as VALIDSIG, but we err on the very safe side.
Introduce additional status codes E, X, Y, R for ERRSIG, EXPSIG,
EXPKEYSIG, and REVKEYSIG so that a user of %G? gets more information
about the absence of a 'G' on first glance.
Requested-by: Alex <agrambot@gmail.com>
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pretty.c')
-rw-r--r-- | pretty.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -1232,8 +1232,12 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */ switch (c->signature_check.result) { case 'G': case 'B': + case 'E': case 'U': case 'N': + case 'X': + case 'Y': + case 'R': strbuf_addch(sb, c->signature_check.result); } break; |