Merge branch 'tb/ls-files-eol'

diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 5f2c7441f3c6975b98edbc726b7ba82af9794aec..5b9dd6a9d8ebe888c2fc912af3590b92737e7a99 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);
 }
 
+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;
@@ -118,7 +143,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
        unsigned send_mirror = 0;
        unsigned force_update = 0;
        unsigned quiet = 0;
-       unsigned push_cert = 0;
+       int push_cert = 0;
        unsigned use_thin_pack = 0;
        unsigned atomic = 0;
        unsigned stateless_rpc = 0;
@@ -137,7 +162,9 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
                OPT_BOOL('n' , "dry-run", &dry_run, N_("dry run")),
                OPT_BOOL(0, "mirror", &send_mirror, N_("mirror all refs")),
                OPT_BOOL('f', "force", &force_update, N_("force updates")),
-               OPT_BOOL(0, "signed", &push_cert, N_("GPG sign the push")),
+               { OPTION_CALLBACK,
+                 0, "signed", &push_cert, "yes|no|if-asked", N_("GPG sign the push"),
+                 PARSE_OPT_OPTARG, option_parse_push_signed },
                OPT_BOOL(0, "progress", &progress, N_("force progress reporting")),
                OPT_BOOL(0, "thin", &use_thin_pack, N_("use thin pack")),
                OPT_BOOL(0, "atomic", &atomic, N_("request atomic transaction on remote side")),
@@ -151,7 +178,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
                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];
@@ -185,7 +212,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
                                argv_array_push(&all_refspecs, buf);
                } else {
                        struct strbuf line = STRBUF_INIT;
-                       while (strbuf_getline(&line, stdin, '\n') != EOF)
+                       while (strbuf_getline(&line, stdin) != EOF)
                                argv_array_push(&all_refspecs, line.buf);
                        strbuf_release(&line);
                }