Merge branch 'sg/t3020-typofix' into maint

diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index b961e5ae7856626ebc063e94bfeee75383d27aeb..23b2962cb0c1443b202bcab0b73023109e06999c 100644 (file)
--- 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;