[PATCH 5/5] pretty: make %GK output the signing key for signed commits
- From
Michael J Gruber <git@drmicha.warpmail.net>
- Date
- Feb 14, 2013, 16:04 UTC
- Message-ID
- <6787e82ff88f641eeb17245e93e9240e61270842.1360857415.git.git@drmicha.warpmail.net>
- In-Reply-To
- <CAJ9Ak2pLqUesOWKNtjwG7P_BW7-EqJP4Kaj0FF_+72Wn=oGoew@mail.gmail.com>
Because we can.
No, really: In order to employ signed keys in an automated way it is absolutely necessary to check which keys the signatures come from. Now you can.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> --- Documentation/pretty-formats.txt | 1 + pretty.c | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index 105f18a..2939655 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -133,6 +133,7 @@ The placeholders are: - '%GG': raw verification message from GPG for a signed commit - '%G?': show either "G" for Good or "B" for Bad for a signed commit - '%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}` - '%gd': shortened reflog selector, e.g., `stash@{1}` - '%gn': reflog identity name diff --git a/pretty.c b/pretty.c index 973b912..b57adef 100644 --- a/pretty.c +++ b/pretty.c @@ -762,6 +762,7 @@ struct format_commit_context { char *gpg_status; char good_bad; char *signer; + char *key; } signature; char *message; size_t width, indent1, indent2; @@ -964,7 +965,9 @@ static void parse_signature_lines(struct format_commit_context *ctx) if (!found) continue; ctx->signature.good_bad = signature_check[i].result; - found += strlen(signature_check[i].check)+17; + found += strlen(signature_check[i].check); + ctx->signature.key = xmemdupz(found, 16); + found += 17; next = strchrnul(found, '\n'); ctx->signature.signer = xmemdupz(found, next - found); break; @@ -1204,6 +1207,10 @@ static size_t format_commit_one(struct strbuf *sb, const char *placeholder, if (c->signature.signer) strbuf_addstr(sb, c->signature.signer); break; + case 'K': + if (c->signature.key) + strbuf_addstr(sb, c->signature.key); + break; } return 2; }
-- 1.8.1.3.797.ge0260c7