diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-01-31 01:17:08 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-01-31 01:17:08 +0300 |
commit | 11ad30b887e2512df1c7703913048827080601e1 (patch) | |
tree | f9dcd7481c4ecd335d3f2c76a7637433d8d59d9e /pretty.c | |
parent | 96aef8f68404964c48d0d85ce04f6b2d84097246 (diff) | |
parent | 54887b46890582e60fcb8ee1f287f62870c2ac0f (diff) |
Merge branch 'hi/gpg-mintrustlevel'
gpg.minTrustLevel configuration variable has been introduced to
tell various signature verification codepaths the required minimum
trust level.
* hi/gpg-mintrustlevel:
gpg-interface: add minTrustLevel as a configuration option
Diffstat (limited to 'pretty.c')
-rw-r--r-- | pretty.c | 30 |
1 files changed, 29 insertions, 1 deletions
@@ -1311,9 +1311,18 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */ case '?': switch (c->signature_check.result) { case 'G': + switch (c->signature_check.trust_level) { + case TRUST_UNDEFINED: + case TRUST_NEVER: + strbuf_addch(sb, 'U'); + break; + default: + strbuf_addch(sb, 'G'); + break; + } + break; case 'B': case 'E': - case 'U': case 'N': case 'X': case 'Y': @@ -1337,6 +1346,25 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */ if (c->signature_check.primary_key_fingerprint) strbuf_addstr(sb, c->signature_check.primary_key_fingerprint); break; + case 'T': + switch (c->signature_check.trust_level) { + case TRUST_UNDEFINED: + strbuf_addstr(sb, "undefined"); + break; + case TRUST_NEVER: + strbuf_addstr(sb, "never"); + break; + case TRUST_MARGINAL: + strbuf_addstr(sb, "marginal"); + break; + case TRUST_FULLY: + strbuf_addstr(sb, "fully"); + break; + case TRUST_ULTIMATE: + strbuf_addstr(sb, "ultimate"); + break; + } + break; default: return 0; } |