summaryrefslogtreecommitdiff
path: root/pretty.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-26 13:14:45 -0700
committerJunio C Hamano <gitster@pobox.com>2016-10-26 13:14:45 -0700
commit56d268bafff7538f82c01d3c9c07bdc54b2993b1 (patch)
tree3ea9958f7aa260206a186b3a198b3e279141ae31 /pretty.c
parenta03973893bdbc1a53c705daf70a73994ac46492f (diff)
parent661a1806819ca98c446f82b19e6c98fa174d33a4 (diff)
downloadgit-56d268bafff7538f82c01d3c9c07bdc54b2993b1.tar.gz
Merge branch 'mg/gpg-richer-status'
The GPG verification status shown in "%G?" pretty format specifier was not rich enough to differentiate a signature made by an expired key, a signature made by a revoked key, etc. New output letters have been assigned to express them. * mg/gpg-richer-status: gpg-interface: use more status letters
Diffstat (limited to 'pretty.c')
-rw-r--r--pretty.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/pretty.c b/pretty.c
index 0c31495240..37b2c3b1f9 100644
--- a/pretty.c
+++ b/pretty.c
@@ -1230,8 +1230,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;