diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2015-06-21 23:14:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-22 21:20:46 (GMT) |
| commit | 434060ec6d9bf50f095db901da3fb9b557e11df1 (patch) | |
| tree | 7a7dc99fb6b8e1e5eaa566ec4eb5e29ff807e8f2 /builtin/verify-commit.c | |
| parent | 8e98e5f27aba812c0f095b7e546871e14a4139f6 (diff) | |
| download | git-434060ec6d9bf50f095db901da3fb9b557e11df1.zip git-434060ec6d9bf50f095db901da3fb9b557e11df1.tar.gz git-434060ec6d9bf50f095db901da3fb9b557e11df1.tar.bz2 | |
gpg: centralize signature check
verify-commit and verify-tag both share a central codepath for verifying
commits: check_signature. However, verify-tag exited successfully for
untrusted signature, while verify-commit exited unsuccessfully.
Centralize this signature check and make verify-commit adopt the older
verify-tag behavior. This behavior is more logical anyway, as the
signature is in fact valid, whether or not there's a path of trust to
the author.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/verify-commit.c')
| -rw-r--r-- | builtin/verify-commit.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/verify-commit.c b/builtin/verify-commit.c index ec0c4e3..e30f7cf 100644 --- a/builtin/verify-commit.c +++ b/builtin/verify-commit.c @@ -21,10 +21,11 @@ static const char * const verify_commit_usage[] = { static int run_gpg_verify(const unsigned char *sha1, const char *buf, unsigned long size, int verbose) { struct signature_check signature_check; + int ret; memset(&signature_check, 0, sizeof(signature_check)); - check_commit_signature(lookup_commit(sha1), &signature_check); + ret = check_commit_signature(lookup_commit(sha1), &signature_check); if (verbose && signature_check.payload) fputs(signature_check.payload, stdout); @@ -33,7 +34,7 @@ static int run_gpg_verify(const unsigned char *sha1, const char *buf, unsigned l fputs(signature_check.gpg_output, stderr); signature_check_clear(&signature_check); - return signature_check.result != 'G'; + return ret; } static int verify_commit(const char *name, int verbose) |