Skip to content

Commit

Permalink
Merge branch 'db/send-pack-user-signingkey'
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Junio C Hamano committed Aug 3, 2015
2 parents c124017 + d830d39 commit 0c54706
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions builtin/send-pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 0c54706

Please sign in to comment.