diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-19 21:41:26 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-19 21:41:26 (GMT) |
| commit | 7e7ce32f7aa3b2b63d267c7efa173d129d1096cb (patch) | |
| tree | db00c1a76bd9b6b1de16aeeba326c25e05701003 /builtin | |
| parent | 17850efa5f5c471f622d860e8ebd9f28de3c388e (diff) | |
| parent | d830d395a17a146cfef2aae1c3603907fe3c890b (diff) | |
| download | git-7e7ce32f7aa3b2b63d267c7efa173d129d1096cb.zip git-7e7ce32f7aa3b2b63d267c7efa173d129d1096cb.tar.gz git-7e7ce32f7aa3b2b63d267c7efa173d129d1096cb.tar.bz2 | |
Merge branch 'db/send-pack-user-signingkey' into maint
The low-level "git send-pack" did not honor 'user.signingkey'
configuration variable when sending a signed-push.
* db/send-pack-user-signingkey:
builtin/send-pack.c: respect user.signingkey
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/send-pack.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/send-pack.c b/builtin/send-pack.c index b961e5a..23b2962 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -11,6 +11,7 @@ #include "transport.h" #include "version.h" #include "sha1-array.h" +#include "gpg-interface.h" static const char send_pack_usage[] = "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> [<ref>...]\n" @@ -113,6 +114,8 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix) int from_stdin = 0; struct push_cas_option cas = {0}; + git_config(git_gpg_config, NULL); + argv++; for (i = 1; i < argc; i++, argv++) { const char *arg = *argv; |