From: Sebastian Götte Date: Sun, 31 Mar 2013 16:03:22 +0000 (+0200) Subject: pretty printing: extend %G? to include 'N' and 'U' X-Git-Tag: v1.8.3-rc0~111^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e290c4b944f109aff26cc3db4ae0aec92f3cc126;p=thirdparty%2Fgit.git pretty printing: extend %G? to include 'N' and 'U' Expand %G? in pretty format strings to 'N' in case of no GPG signature and 'U' in case of a good but untrusted GPG signature in addition to the previous 'G'ood and 'B'ad. This eases writing anyting parsing git-log output. Signed-off-by: Sebastian Götte Signed-off-by: Junio C Hamano --- diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index 293965524e..afac703f21 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -131,7 +131,8 @@ The placeholders are: - '%B': raw body (unwrapped subject and body) - '%N': commit notes - '%GG': raw verification message from GPG for a signed commit -- '%G?': show either "G" for Good or "B" for Bad for a signed commit +- '%G?': show "G" for a Good signature, "B" for a Bad signature, "U" for a good, + untrusted signature and "N" for no signature - '%GS': show the name of the signer for a signed commit - '%GK': show the key used to sign a signed commit - '%gD': reflog selector, e.g., `refs/stash@{1}` diff --git a/pretty.c b/pretty.c index 35b592ad83..d3a82d22d3 100644 --- a/pretty.c +++ b/pretty.c @@ -1145,6 +1145,8 @@ static size_t format_commit_one(struct strbuf *sb, const char *placeholder, switch (c->signature_check.result) { case 'G': case 'B': + case 'U': + case 'N': strbuf_addch(sb, c->signature_check.result); } break;