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>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 2e919f0df8c13b31cbea45690d2677809116bf88..aff13a978f70b074cd161b3e9d594bdaa6ad6551 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2117,6 +2117,14 @@ push.followTags::
        may override this configuration at time of push by specifying
        '--no-follow-tags'.
 
        may override this configuration at time of push by specifying
        '--no-follow-tags'.
 

+push.gpgSign::
+       May be set to a boolean value, or the string 'if-asked'. A true
+       value causes all pushes to be GPG signed, as if '--signed' is
+       passed to linkgit:git-push[1]. The string 'if-asked' causes
+       pushes to be signed if the server supports it, as if
+       '--signed=if-asked' is passed to 'git push'. A false value may
+       override a value from a lower-priority config file. An explicit
+       command-line flag always overrides this config option.

 
 rebase.stat::
        Whether to show a diffstat of what changed upstream since the last
 
 rebase.stat::
        Whether to show a diffstat of what changed upstream since the last

diff --git a/builtin/push.c b/builtin/push.c
index 85a82cd21d6de4688914d49c8da71693794366bf..3bda430b6b1cf455986afae537ee8429dae5a001 100644 (file)
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -472,6 +472,24 @@ static int option_parse_recurse_submodules(const struct option *opt,
        return 0;
 }
 
        return 0;
 }
 

+static void set_push_cert_flags(int *flags, int v)
+{
+       switch (v) {
+       case SEND_PACK_PUSH_CERT_NEVER:
+               *flags &= ~(TRANSPORT_PUSH_CERT_ALWAYS | TRANSPORT_PUSH_CERT_IF_ASKED);
+               break;
+       case SEND_PACK_PUSH_CERT_ALWAYS:
+               *flags |= TRANSPORT_PUSH_CERT_ALWAYS;
+               *flags &= ~TRANSPORT_PUSH_CERT_IF_ASKED;
+               break;
+       case SEND_PACK_PUSH_CERT_IF_ASKED:
+               *flags |= TRANSPORT_PUSH_CERT_IF_ASKED;
+               *flags &= ~TRANSPORT_PUSH_CERT_ALWAYS;
+               break;
+       }
+}
+
+

 static int git_push_config(const char *k, const char *v, void *cb)
 {
        int *flags = cb;
 static int git_push_config(const char *k, const char *v, void *cb)
 {
        int *flags = cb;


@@ -487,6 +505,23 @@ static int git_push_config(const char *k, const char *v, void *cb)
                else
                        *flags &= ~TRANSPORT_PUSH_FOLLOW_TAGS;
                return 0;
                else
                        *flags &= ~TRANSPORT_PUSH_FOLLOW_TAGS;
                return 0;

+       } else if (!strcmp(k, "push.gpgsign")) {
+               const char *value;
+               if (!git_config_get_value("push.gpgsign", &value)) {
+                       switch (git_config_maybe_bool("push.gpgsign", value)) {
+                       case 0:
+                               set_push_cert_flags(flags, SEND_PACK_PUSH_CERT_NEVER);
+                               break;
+                       case 1:
+                               set_push_cert_flags(flags, SEND_PACK_PUSH_CERT_ALWAYS);
+                               break;
+                       default:
+                               if (value && !strcasecmp(value, "if-asked"))
+                                       set_push_cert_flags(flags, SEND_PACK_PUSH_CERT_IF_ASKED);
+                               else
+                                       return error("Invalid value for '%s'", k);
+                       }
+               }

        }
 
        return git_default_config(k, v, NULL);
        }
 
        return git_default_config(k, v, NULL);


@@ -538,6 +573,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
        packet_trace_identity("push");
        git_config(git_push_config, &flags);
        argc = parse_options(argc, argv, prefix, options, push_usage, 0);
        packet_trace_identity("push");
        git_config(git_push_config, &flags);
        argc = parse_options(argc, argv, prefix, options, push_usage, 0);

+       set_push_cert_flags(&flags, push_cert);

 
        if (deleterefs && (tags || (flags & (TRANSPORT_PUSH_ALL | TRANSPORT_PUSH_MIRROR))))
                die(_("--delete is incompatible with --all, --mirror and --tags"));
 
        if (deleterefs && (tags || (flags & (TRANSPORT_PUSH_ALL | TRANSPORT_PUSH_MIRROR))))
                die(_("--delete is incompatible with --all, --mirror and --tags"));


@@ -552,20 +588,6 @@ int cmd_push(int argc, const char **argv, const char *prefix)
                set_refspecs(argv + 1, argc - 1, repo);
        }
 
                set_refspecs(argv + 1, argc - 1, repo);
        }
 

-       switch (push_cert) {
-       case SEND_PACK_PUSH_CERT_NEVER:
-               flags &= ~(TRANSPORT_PUSH_CERT_ALWAYS | TRANSPORT_PUSH_CERT_IF_ASKED);
-               break;
-       case SEND_PACK_PUSH_CERT_ALWAYS:
-               flags |= TRANSPORT_PUSH_CERT_ALWAYS;
-               flags &= ~TRANSPORT_PUSH_CERT_IF_ASKED;
-               break;
-       case SEND_PACK_PUSH_CERT_IF_ASKED:
-               flags |= TRANSPORT_PUSH_CERT_IF_ASKED;
-               flags &= ~TRANSPORT_PUSH_CERT_ALWAYS;
-               break;
-       }
-

        rc = do_push(repo, flags);
        if (rc == -1)
                usage_with_options(push_usage, options);
        rc = do_push(repo, flags);
        if (rc == -1)
                usage_with_options(push_usage, options);

diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 0ce3bc8c41985b0c55926db97fab47e24a581f18..f6e5d643c193d28b14107bf9a9e4ee7aa36ca933 100644 (file)
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -97,6 +97,31 @@ static void print_helper_status(struct ref *ref)
        strbuf_release(&buf);
 }
 
        strbuf_release(&buf);
 }
 

+static int send_pack_config(const char *k, const char *v, void *cb)
+{
+       git_gpg_config(k, v, NULL);
+
+       if (!strcmp(k, "push.gpgsign")) {
+               const char *value;
+               if (!git_config_get_value("push.gpgsign", &value)) {
+                       switch (git_config_maybe_bool("push.gpgsign", value)) {
+                       case 0:
+                               args.push_cert = SEND_PACK_PUSH_CERT_NEVER;
+                               break;
+                       case 1:
+                               args.push_cert = SEND_PACK_PUSH_CERT_ALWAYS;
+                               break;
+                       default:
+                               if (value && !strcasecmp(value, "if-asked"))
+                                       args.push_cert = SEND_PACK_PUSH_CERT_IF_ASKED;
+                               else
+                                       return error("Invalid value for '%s'", k);
+                       }
+               }
+       }
+       return 0;
+}
+

 int cmd_send_pack(int argc, const char **argv, const char *prefix)
 {
        int i, nr_refspecs = 0;
 int cmd_send_pack(int argc, const char **argv, const char *prefix)
 {
        int i, nr_refspecs = 0;


@@ -153,7 +178,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
                OPT_END()
        };
 
                OPT_END()
        };
 

-       git_config(git_gpg_config, NULL);
+       git_config(send_pack_config, NULL);

        argc = parse_options(argc, argv, prefix, options, send_pack_usage, 0);
        if (argc > 0) {
                dest = argv[0];
        argc = parse_options(argc, argv, prefix, options, send_pack_usage, 0);
        if (argc > 0) {
                dest = argv[0];