diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-10-24 15:01:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-24 15:01:32 -0700 |
| commit | a33043f6393ae2a737f08d4f42d78fb06ba1e107 (patch) | |
| tree | ee1d8949ab87bdc80f9e63320306938fc3a76b36 /builtin | |
| parent | Merge branch 'sb/plug-transport-leak' (diff) | |
| parent | push: heed user.signingkey for signed pushes (diff) | |
| download | tgif-a33043f6393ae2a737f08d4f42d78fb06ba1e107.tar.xz | |
Merge branch 'jc/push-cert'
* jc/push-cert:
push: heed user.signingkey for signed pushes
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/push.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/builtin/push.c b/builtin/push.c index ae56f73a66..a076b1964d 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -471,6 +471,17 @@ static int option_parse_recurse_submodules(const struct option *opt, return 0; } +static int git_push_config(const char *k, const char *v, void *cb) +{ + struct wt_status *s = cb; + int status; + + status = git_gpg_config(k, v, NULL); + if (status) + return status; + return git_default_config(k, v, s); +} + int cmd_push(int argc, const char **argv, const char *prefix) { int flags = 0; @@ -511,7 +522,7 @@ int cmd_push(int argc, const char **argv, const char *prefix) }; packet_trace_identity("push"); - git_config(git_default_config, NULL); + git_config(git_push_config, NULL); argc = parse_options(argc, argv, prefix, options, push_usage, 0); if (deleterefs && (tags || (flags & (TRANSPORT_PUSH_ALL | TRANSPORT_PUSH_MIRROR)))) |