@ -12,10 +12,15 @@
#include "version.h"#include "version.h"
#include "sha1-array.h"#include "sha1-array.h"
#include "gpg-interface.h"#include "gpg-interface.h"
#include "gettext.h"
static const char send_pack_usage[] =static const char * const send_pack_usage[] = {
"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> [<ref>...]\n" N_("git send-pack [--all | --mirror] [--dry-run] [--force] "
" --all and explicit <ref> specification are mutually exclusive."; "[--receive-pack=<git-receive-pack>] [--verbose] [--thin] [--atomic] "
"[<host>:]<directory> [<ref>...]\n"
" --all and explicit <ref> specification are mutually exclusive."),
NULL,
};
static struct send_pack_args args;static struct send_pack_args args;
@ -92,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 cmd_send_pack(int argc, const char **argv, const char *prefix)
{{
int i, nr_refspecs = 0; int i, nr_refspecs = 0;
@ -107,116 +137,68 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
int ret; int ret;
int helper_status = 0; int helper_status = 0;
int send_all = 0; int send_all = 0;
int verbose = 0;
const char *receivepack = "git-receive-pack"; const char *receivepack = "git-receive-pack";
unsigned dry_run = 0;
unsigned send_mirror = 0;
unsigned force_update = 0;
unsigned quiet = 0;
int push_cert = 0;
unsigned use_thin_pack = 0;
unsigned atomic = 0;
unsigned stateless_rpc = 0;
int flags; int flags;
unsigned int reject_reasons; unsigned int reject_reasons;
int progress = -1; int progress = -1;
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); struct option options[] = {
OPT__VERBOSITY(&verbose),
argv++; OPT_STRING(0, "receive-pack", &receivepack, "receive-pack", N_("receive pack program")),
for (i = 1; i < argc; i++, argv++) { OPT_STRING(0, "exec", &receivepack, "receive-pack", N_("receive pack program")),
const char *arg = *argv; OPT_STRING(0, "remote", &remote_name, "remote", N_("remote name")),
OPT_BOOL(0, "all", &send_all, N_("push all refs")),
if (*arg == '-') { OPT_BOOL('n' , "dry-run", &dry_run, N_("dry run")),
if (starts_with(arg, "--receive-pack=")) { OPT_BOOL(0, "mirror", &send_mirror, N_("mirror all refs")),
receivepack = arg + 15; OPT_BOOL('f', "force", &force_update, N_("force updates")),
continue; { OPTION_CALLBACK,
} 0, "signed", &push_cert, "yes|no|if-asked", N_("GPG sign the push"),
if (starts_with(arg, "--exec=")) { PARSE_OPT_OPTARG, option_parse_push_signed },
receivepack = arg + 7; OPT_BOOL(0, "progress", &progress, N_("force progress reporting")),
continue; OPT_BOOL(0, "thin", &use_thin_pack, N_("use thin pack")),
} OPT_BOOL(0, "atomic", &atomic, N_("request atomic transaction on remote side")),
if (starts_with(arg, "--remote=")) { OPT_BOOL(0, "stateless-rpc", &stateless_rpc, N_("use stateless RPC protocol")),
remote_name = arg + 9; OPT_BOOL(0, "stdin", &from_stdin, N_("read refs from stdin")),
continue; OPT_BOOL(0, "helper-status", &helper_status, N_("print status from remote helper")),
} { OPTION_CALLBACK,
if (!strcmp(arg, "--all")) { 0, CAS_OPT_NAME, &cas, N_("refname>:<expect"),
send_all = 1; N_("require old value of ref to be at this value"),
continue; PARSE_OPT_OPTARG, parseopt_push_cas_option },
} OPT_END()
if (!strcmp(arg, "--dry-run")) { };
args.dry_run = 1;
continue; git_config(send_pack_config, NULL);
} argc = parse_options(argc, argv, prefix, options, send_pack_usage, 0);
if (!strcmp(arg, "--mirror")) { if (argc > 0) {
args.send_mirror = 1; dest = argv[0];
continue; refspecs = (const char **)(argv + 1);
} nr_refspecs = argc - 1;
if (!strcmp(arg, "--force")) {
args.force_update = 1;
continue;
}
if (!strcmp(arg, "--quiet")) {
args.quiet = 1;
continue;
}
if (!strcmp(arg, "--verbose")) {
args.verbose = 1;
continue;
}
if (!strcmp(arg, "--signed")) {
args.push_cert = 1;
continue;
}
if (!strcmp(arg, "--progress")) {
progress = 1;
continue;
}
if (!strcmp(arg, "--no-progress")) {
progress = 0;
continue;
}
if (!strcmp(arg, "--thin")) {
args.use_thin_pack = 1;
continue;
}
if (!strcmp(arg, "--atomic")) {
args.atomic = 1;
continue;
}
if (!strcmp(arg, "--stateless-rpc")) {
args.stateless_rpc = 1;
continue;
}
if (!strcmp(arg, "--stdin")) {
from_stdin = 1;
continue;
}
if (!strcmp(arg, "--helper-status")) {
helper_status = 1;
continue;
}
if (!strcmp(arg, "--" CAS_OPT_NAME)) {
if (parse_push_cas_option(&cas, NULL, 0) < 0)
exit(1);
continue;
}
if (!strcmp(arg, "--no-" CAS_OPT_NAME)) {
if (parse_push_cas_option(&cas, NULL, 1) < 0)
exit(1);
continue;
}
if (starts_with(arg, "--" CAS_OPT_NAME "=")) {
if (parse_push_cas_option(&cas,
strchr(arg, '=') + 1, 0) < 0)
exit(1);
continue;
}
usage(send_pack_usage);
}
if (!dest) {
dest = arg;
continue;
}
refspecs = (const char **) argv;
nr_refspecs = argc - i;
break;
} }
if (!dest) if (!dest)
usage(send_pack_usage); usage_with_options(send_pack_usage, options);
args.verbose = verbose;
args.dry_run = dry_run;
args.send_mirror = send_mirror;
args.force_update = force_update;
args.quiet = quiet;
args.push_cert = push_cert;
args.progress = progress;
args.use_thin_pack = use_thin_pack;
args.atomic = atomic;
args.stateless_rpc = stateless_rpc;
if (from_stdin) { if (from_stdin) {
struct argv_array all_refspecs = ARGV_ARRAY_INIT; struct argv_array all_refspecs = ARGV_ARRAY_INIT;
@ -245,7 +227,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
*/ */
if ((refspecs && (send_all || args.send_mirror)) || if ((refspecs && (send_all || args.send_mirror)) ||
(send_all && args.send_mirror)) (send_all && args.send_mirror))
usage(send_pack_usage); usage_with_options(send_pack_usage, options);
if (remote_name) { if (remote_name) {
remote = remote_get(remote_name); remote = remote_get(remote_name);
Junio C Hamano
10 years ago