diff options
Diffstat (limited to 'gpg-interface.c')
| -rw-r--r-- | gpg-interface.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gpg-interface.c b/gpg-interface.c index cb171a853b..48f43c5a21 100644 --- a/gpg-interface.c +++ b/gpg-interface.c @@ -12,8 +12,10 @@ #include "sigchain.h" #include "tempfile.h" #include "alias.h" +#include "environment.h" -static int git_gpg_config(const char *, const char *, void *); +static int git_gpg_config(const char *, const char *, + const struct config_context *, void *); static void gpg_interface_lazy_init(void) { @@ -585,8 +587,8 @@ static int verify_ssh_signed_buffer(struct signature_check *sigc, } } - strbuf_stripspace(&ssh_keygen_out, 0); - strbuf_stripspace(&ssh_keygen_err, 0); + strbuf_stripspace(&ssh_keygen_out, '\0'); + strbuf_stripspace(&ssh_keygen_err, '\0'); /* Add stderr outputs to show the user actual ssh-keygen errors */ strbuf_add(&ssh_keygen_out, ssh_principals_err.buf, ssh_principals_err.len); strbuf_add(&ssh_keygen_out, ssh_keygen_err.buf, ssh_keygen_err.len); @@ -719,7 +721,9 @@ void set_signing_key(const char *key) configured_signing_key = xstrdup(key); } -static int git_gpg_config(const char *var, const char *value, void *cb UNUSED) +static int git_gpg_config(const char *var, const char *value, + const struct config_context *ctx UNUSED, + void *cb UNUSED) { struct gpg_format *fmt = NULL; char *fmtname = NULL; |