push: add a config option push.gpgSign for default signed pushes
Signed-off-by: Dave Borowitz <dborowitz@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Dave Borowitz committed
Aug 19, 2015 at 11:26 UTC
68c757f2199911005918aba45aa8ae0fecc72074
3 files changed
+70
-15
Documentation/config.txt
+8
@@ -2117,6 +2117,14 @@ push.followTags::
2117
may override this configuration at time of push by specifying
2118
'--no-follow-tags'.
2119
2120
+push.gpgSign::
2121
+ May be set to a boolean value, or the string 'if-asked'. A true
2122
+ value causes all pushes to be GPG signed, as if '--signed' is
2123
+ passed to linkgit:git-push[1]. The string 'if-asked' causes
2124
+ pushes to be signed if the server supports it, as if
2125
+ '--signed=if-asked' is passed to 'git push'. A false value may
2126
+ override a value from a lower-priority config file. An explicit
2127
+ command-line flag always overrides this config option.
2128
2129
rebase.stat::
2130
Whether to show a diffstat of what changed upstream since the last
builtin/push.c
+36
-14
@@ -472,6 +472,24 @@ static int option_parse_recurse_submodules(const struct option *opt,
472
return 0;
473
}
474
475
+static void set_push_cert_flags(int *flags, int v)
476
+{
477
+ switch (v) {
478
+ case SEND_PACK_PUSH_CERT_NEVER:
479
+ *flags &= ~(TRANSPORT_PUSH_CERT_ALWAYS | TRANSPORT_PUSH_CERT_IF_ASKED);
480
+ break;
481
+ case SEND_PACK_PUSH_CERT_ALWAYS:
482
+ *flags |= TRANSPORT_PUSH_CERT_ALWAYS;
483
+ *flags &= ~TRANSPORT_PUSH_CERT_IF_ASKED;
484
+ break;
485
+ case SEND_PACK_PUSH_CERT_IF_ASKED:
486
+ *flags |= TRANSPORT_PUSH_CERT_IF_ASKED;
487
+ *flags &= ~TRANSPORT_PUSH_CERT_ALWAYS;
488
+ break;
489
+ }
490
+}
491
+
492
+
493
static int git_push_config(const char *k, const char *v, void *cb)
494
{
495
int *flags = cb;
@@ -487,6 +505,23 @@ static int git_push_config(const char *k, const char *v, void *cb)
505
else
506
*flags &= ~TRANSPORT_PUSH_FOLLOW_TAGS;
507
return 0;
508
+ } else if (!strcmp(k, "push.gpgsign")) {
509
+ const char *value;
510
+ if (!git_config_get_value("push.gpgsign", &value)) {
511
+ switch (git_config_maybe_bool("push.gpgsign", value)) {
512
+ case 0:
513
+ set_push_cert_flags(flags, SEND_PACK_PUSH_CERT_NEVER);
514
+ break;
515
+ case 1:
516
+ set_push_cert_flags(flags, SEND_PACK_PUSH_CERT_ALWAYS);
517
+ break;
518
+ default:
519
+ if (value && !strcasecmp(value, "if-asked"))
520
+ set_push_cert_flags(flags, SEND_PACK_PUSH_CERT_IF_ASKED);
521
+ else
522
+ return error("Invalid value for '%s'", k);
523
+ }
524
+ }
525
}
526
527
return git_default_config(k, v, NULL);
@@ -538,6 +573,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
573
packet_trace_identity("push");
574
git_config(git_push_config, &flags);
575
argc = parse_options(argc, argv, prefix, options, push_usage, 0);
576
+ set_push_cert_flags(&flags, push_cert);
577
578
if (deleterefs && (tags || (flags & (TRANSPORT_PUSH_ALL | TRANSPORT_PUSH_MIRROR))))
579
die(_("--delete is incompatible with --all, --mirror and --tags"));
@@ -552,20 +588,6 @@ int cmd_push(int argc, const char **argv, const char *prefix)
588
set_refspecs(argv + 1, argc - 1, repo);
589
}
590
555
- switch (push_cert) {
556
- case SEND_PACK_PUSH_CERT_NEVER:
557
- flags &= ~(TRANSPORT_PUSH_CERT_ALWAYS | TRANSPORT_PUSH_CERT_IF_ASKED);
558
- break;
559
- case SEND_PACK_PUSH_CERT_ALWAYS:
560
- flags |= TRANSPORT_PUSH_CERT_ALWAYS;
561
- flags &= ~TRANSPORT_PUSH_CERT_IF_ASKED;
562
- break;
563
- case SEND_PACK_PUSH_CERT_IF_ASKED:
564
- flags |= TRANSPORT_PUSH_CERT_IF_ASKED;
565
- flags &= ~TRANSPORT_PUSH_CERT_ALWAYS;
566
- break;
567
- }
568
-
591
rc = do_push(repo, flags);
592
if (rc == -1)
593
usage_with_options(push_usage, options);
builtin/send-pack.c
+26
-1
@@ -97,6 +97,31 @@ static void print_helper_status(struct ref *ref)
97
strbuf_release(&buf);
98
}
99
100
+static int send_pack_config(const char *k, const char *v, void *cb)
101
+{
102
+ git_gpg_config(k, v, NULL);
103
+
104
+ if (!strcmp(k, "push.gpgsign")) {
105
+ const char *value;
106
+ if (!git_config_get_value("push.gpgsign", &value)) {
107
+ switch (git_config_maybe_bool("push.gpgsign", value)) {
108
+ case 0:
109
+ args.push_cert = SEND_PACK_PUSH_CERT_NEVER;
110
+ break;
111
+ case 1:
112
+ args.push_cert = SEND_PACK_PUSH_CERT_ALWAYS;
113
+ break;
114
+ default:
115
+ if (value && !strcasecmp(value, "if-asked"))
116
+ args.push_cert = SEND_PACK_PUSH_CERT_IF_ASKED;
117
+ else
118
+ return error("Invalid value for '%s'", k);
119
+ }
120
+ }
121
+ }
122
+ return 0;
123
+}
124
+
125
int cmd_send_pack(int argc, const char **argv, const char *prefix)
126
{
127
int i, nr_refspecs = 0;
@@ -153,7 +178,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
178
OPT_END()
179
};
180
156
- git_config(git_gpg_config, NULL);
181
+ git_config(send_pack_config, NULL);
182
argc = parse_options(argc, argv, prefix, options, send_pack_usage, 0);
183
if (argc > 0) {
184
dest = argv[0];