diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-03 09:26:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-03 09:26:27 -0700 |
| commit | b771d8d7cf9dd9d5901e68526be471722870a9f8 (patch) | |
| tree | e1035ced0b988881dfede8fc5556575e78ab090f /gpg-interface.h | |
| parent | 14c79b1faa113707d8955912af6064d9844f71eb (diff) | |
| parent | 0174eeaa736226a0bea19e9bf88c270d61aa9cce (diff) | |
| download | git-b771d8d7cf9dd9d5901e68526be471722870a9f8.tar.gz | |
Merge branch 'mg/gpg-interface-using-status' into maint
Verification of signed tags were not done correctly when not in C
or en/US locale.
* mg/gpg-interface-using-status:
pretty: make %GK output the signing key for signed commits
pretty: parse the gpg status lines rather than the output
gpg_interface: allow to request status return
log-tree: rely upon the check in the gpg_interface
gpg-interface: check good signature in a reliable way
Diffstat (limited to 'gpg-interface.h')
| -rw-r--r-- | gpg-interface.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gpg-interface.h b/gpg-interface.h index b9c36088ce..cf99021842 100644 --- a/gpg-interface.h +++ b/gpg-interface.h @@ -2,7 +2,7 @@ #define GPG_INTERFACE_H extern int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *signing_key); -extern int verify_signed_buffer(const char *payload, size_t payload_size, const char *signature, size_t signature_size, struct strbuf *gpg_output); +extern int verify_signed_buffer(const char *payload, size_t payload_size, const char *signature, size_t signature_size, struct strbuf *gpg_output, struct strbuf *gpg_status); extern int git_gpg_config(const char *, const char *, void *); extern void set_signing_key(const char *); extern const char *get_signing_key(void); |