undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'db/send-pack-user-signingkey' into maint

Browse Source 
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
This commit is contained in:
Junio C Hamano 2015-08-19 14:41:26 -07:00
commit 7e7ce32f7a
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/send-pack.c
View File

@ -11,6 +11,7 @@
#include "transport.h" #include "transport.h"
#include "version.h" #include "version.h"
#include "sha1-array.h" #include "sha1-array.h"
#include "gpg-interface.h"
static const char send_pack_usage[] = 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" "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; int from_stdin = 0;
struct push_cas_option cas = {0}; struct push_cas_option cas = {0};
git_config(git_gpg_config, NULL);
argv++; argv++;
for (i = 1; i < argc; i++, argv++) { for (i = 1; i < argc; i++, argv++) {
const char *arg = *argv; const char *arg = *argv;