diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-08-14 15:31:13 -0700 | 
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-15 13:23:20 -0700 | 
| commit | a50e7ca3215492b16d96221cf762dbe71ed99722 (patch) | |
| tree | 4d9e15c3f2c9622121225361d19f773c0149c826 /commit.c | |
| parent | c67072b90bdc56501483e0ba96d0d833e86362c3 (diff) | |
| download | git-a50e7ca3215492b16d96221cf762dbe71ed99722.tar.gz | |
gpg-interface: move parse_gpg_output() to where it should be
Earlier, ffb6d7d5 (Move commit GPG signature verification to
commit.c, 2013-03-31) moved this helper that used to be in pretty.c
(i.e. the output code path) to commit.c for better reusability.
It was a good first step in the right direction, but still suffers
from a myopic view that commits will be the only thing we would ever
want to sign---we would actually want to be able to reuse it even
wider.
The function interprets what GPG said; gpg-interface is obviously a
better place.  Move it there.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.c')
| -rw-r--r-- | commit.c | 36 | 
1 files changed, 0 insertions, 36 deletions
| @@ -1220,42 +1220,6 @@ free_return:  	free(buf);  } -static struct { -	char result; -	const char *check; -} sigcheck_gpg_status[] = { -	{ 'G', "\n[GNUPG:] GOODSIG " }, -	{ 'B', "\n[GNUPG:] BADSIG " }, -	{ 'U', "\n[GNUPG:] TRUST_NEVER" }, -	{ 'U', "\n[GNUPG:] TRUST_UNDEFINED" }, -}; - -static void parse_gpg_output(struct signature_check *sigc) -{ -	const char *buf = sigc->gpg_status; -	int i; - -	/* Iterate over all search strings */ -	for (i = 0; i < ARRAY_SIZE(sigcheck_gpg_status); i++) { -		const char *found, *next; - -		if (!skip_prefix(buf, sigcheck_gpg_status[i].check + 1, &found)) { -			found = strstr(buf, sigcheck_gpg_status[i].check); -			if (!found) -				continue; -			found += strlen(sigcheck_gpg_status[i].check); -		} -		sigc->result = sigcheck_gpg_status[i].result; -		/* The trust messages are not followed by key/signer information */ -		if (sigc->result != 'U') { -			sigc->key = xmemdupz(found, 16); -			found += 17; -			next = strchrnul(found, '\n'); -			sigc->signer = xmemdupz(found, next - found); -		} -	} -} -  void check_commit_signature(const struct commit* commit, struct signature_check *sigc)  {  	struct strbuf payload = STRBUF_INIT; | 
