[PATCH v4 5/5] pretty printing: extend %G? to include 'N' and 'U'
- From
- Sebastian Götte <jaseg@physik.tu-berlin.de>
- Date
- Mar 26, 2013, 11:05 UTC
- Message-ID
- <51518114.9050902@physik.tu-berlin.de>
- In-Reply-To
- <cover.1364295502.git.jaseg@physik-pool.tu-berlin.de>
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(-)
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index 2939655..afac703 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 3aac5d8..fc74795 100644 --- a/pretty.c +++ b/pretty.c @@ -1135,6 +1135,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