pretty: make %GK output the signing key for signed commits

In order to employ signed keys in an automated way it is absolutely
necessary to check which keys the signatures come from.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index d9eddedc72a5e6362d68df1b126b76804b9676e1..443381817a38525f78081a2a4c8cbb57ef0e082c 100644 (file)
--- 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
 - '%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
 - '%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 9ffe7bcebb60c7ca9980cf88132841dc9d0ee6fa..9119fe7728b6d78ae6bd583c4f4efbf955761c77 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -695,6 +695,7 @@ struct format_commit_context {
                char *gpg_status;
                char good_bad;
                char *signer;
                char *gpg_status;
                char good_bad;
                char *signer;

+               char *key;

        } signature;
        char *message;
        size_t width, indent1, indent2;
        } signature;
        char *message;
        size_t width, indent1, indent2;


@@ -897,7 +898,9 @@ static void parse_signature_lines(struct format_commit_context *ctx)
                if (!found)
                        continue;
                ctx->signature.good_bad = signature_check[i].result;
                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;
                next = strchrnul(found, '\n');
                ctx->signature.signer = xmemdupz(found, next - found);
                break;


@@ -1130,6 +1133,10 @@ static size_t format_commit_one(struct strbuf *sb, const char *placeholder,
                        if (c->signature.signer)
                                strbuf_addstr(sb, c->signature.signer);
                        break;
                        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;
        }
                }
                return 2;
        }