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 <jaseg@physik-pool.tu-berlin.de> --- Documentation/pretty-formats.txt | 3 ++- pretty.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-)
Show changes to 2 files +4 −1
Documentation/pretty-formats.txt, pretty.c
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index 105f18a..69bd77a 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 - '%gD': reflog selector, e.g., `refs/stash@{1}` - '%gd': shortened reflog selector, e.g., `stash@{1}` diff --git a/pretty.c b/pretty.c index 0547df1..875a1db 100644 --- a/pretty.c +++ b/pretty.c @@ -1136,6 +1136,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;
-- 1.8.1.5