mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pretty: parse the gpg status lines rather than the output

Browse Source 
Currently, parse_signature_lines() parses the gpg output for strings
which depend on LANG so it fails to recognize good commit signatures
(and thus does not fill in %G? and the like) in most locales.

Make it parse the status lines from gpg instead, which are the proper
machine interface. This fixes the problem described above.

There is a change in behavior for "%GS" which we intentionally do not
work around: "%GS" used to put quotes around the signer's uid (or
rather: it inherited from the gpg user output). We output the uid
without quotes now, just like author and committer names.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael J Gruber
2013-02-14 17:04:45 +01:00
committed by Junio C Hamano
parent 9cc4ac8ff1
commit 4a868fd655
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pretty.c
View File

@ -692,6 +692,7 @@ struct format_commit_context {
unsigned commit_signature_parsed:1; unsigned commit_signature_parsed:1;
struct { struct {
char *gpg_output; char *gpg_output;
char *gpg_status;
char good_bad; char good_bad;
char *signer; char *signer;
} signature; } signature;
@ -881,13 +882,13 @@ static struct {
char result; char result;
const char *check; const char *check;
} signature_check[] = { } signature_check[] = {
{ 'G', ": Good signature from " }, { 'G', "\n[GNUPG:] GOODSIG " },
{ 'B', ": BAD signature from " }, { 'B', "\n[GNUPG:] BADSIG " },
}; };
static void parse_signature_lines(struct format_commit_context *ctx) static void parse_signature_lines(struct format_commit_context *ctx)
{ {
const char *buf = ctx->signature.gpg_output; const char *buf = ctx->signature.gpg_status;
int i; int i;
for (i = 0; i < ARRAY_SIZE(signature_check); i++) { for (i = 0; i < ARRAY_SIZE(signature_check); i++) {
@ -896,7 +897,7 @@ static void parse_signature_lines(struct format_commit_context *ctx)
if (!found) if (!found)
continue; continue;
ctx->signature.good_bad = signature_check[i].result; ctx->signature.good_bad = signature_check[i].result;
found += strlen(signature_check[i].check); found += strlen(signature_check[i].check)+17;
next = strchrnul(found, '\n'); next = strchrnul(found, '\n');
ctx->signature.signer = xmemdupz(found, next - found); ctx->signature.signer = xmemdupz(found, next - found);
break; break;
@ -908,6 +909,7 @@ static void parse_commit_signature(struct format_commit_context *ctx)
struct strbuf payload = STRBUF_INIT; struct strbuf payload = STRBUF_INIT;
struct strbuf signature = STRBUF_INIT; struct strbuf signature = STRBUF_INIT;
struct strbuf gpg_output = STRBUF_INIT; struct strbuf gpg_output = STRBUF_INIT;
struct strbuf gpg_status = STRBUF_INIT;
int status; int status;
ctx->commit_signature_parsed = 1; ctx->commit_signature_parsed = 1;
@ -917,13 +919,15 @@ static void parse_commit_signature(struct format_commit_context *ctx)
goto out; goto out;
status = verify_signed_buffer(payload.buf, payload.len, status = verify_signed_buffer(payload.buf, payload.len,
signature.buf, signature.len, signature.buf, signature.len,
&gpg_output, NULL); &gpg_output, &gpg_status);
if (status && !gpg_output.len) if (status && !gpg_output.len)
goto out; goto out;
ctx->signature.gpg_output = strbuf_detach(&gpg_output, NULL); ctx->signature.gpg_output = strbuf_detach(&gpg_output, NULL);
ctx->signature.gpg_status = strbuf_detach(&gpg_status, NULL);
parse_signature_lines(ctx); parse_signature_lines(ctx);
out: out:
strbuf_release(&gpg_status);
strbuf_release(&gpg_output); strbuf_release(&gpg_output);
strbuf_release(&payload); strbuf_release(&payload);
strbuf_release(&signature); strbuf_release(&signature);