Merge branch 'bw/protocol-v2'
The beginning of the next-gen transfer protocol. * bw/protocol-v2: (35 commits) remote-curl: don't request v2 when pushing remote-curl: implement stateless-connect command http: eliminate "# service" line when using protocol v2 http: don't always add Git-Protocol header http: allow providing extra headers for http requests remote-curl: store the protocol version the server responded with remote-curl: create copy of the service name pkt-line: add packet_buf_write_len function transport-helper: introduce stateless-connect transport-helper: refactor process_connect_service transport-helper: remove name parameter connect: don't request v2 when pushing connect: refactor git_connect to only get the protocol version once fetch-pack: support shallow requests fetch-pack: perform a fetch using v2 upload-pack: introduce fetch server command push: pass ref prefixes when pushing fetch: pass ref prefixes when fetching ls-remote: pass ref prefixes when requesting a remote's refs transport: convert transport_get_remote_refs to take a list of ref prefixes ...
This commit is contained in:
74
builtin/upload-pack.c
Normal file
74
builtin/upload-pack.c
Normal file
@ -0,0 +1,74 @@
|
||||
#include "cache.h"
|
||||
#include "builtin.h"
|
||||
#include "exec-cmd.h"
|
||||
#include "pkt-line.h"
|
||||
#include "parse-options.h"
|
||||
#include "protocol.h"
|
||||
#include "upload-pack.h"
|
||||
#include "serve.h"
|
||||
|
||||
static const char * const upload_pack_usage[] = {
|
||||
N_("git upload-pack [<options>] <dir>"),
|
||||
NULL
|
||||
};
|
||||
|
||||
int cmd_upload_pack(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
const char *dir;
|
||||
int strict = 0;
|
||||
struct upload_pack_options opts = { 0 };
|
||||
struct serve_options serve_opts = SERVE_OPTIONS_INIT;
|
||||
struct option options[] = {
|
||||
OPT_BOOL(0, "stateless-rpc", &opts.stateless_rpc,
|
||||
N_("quit after a single request/response exchange")),
|
||||
OPT_BOOL(0, "advertise-refs", &opts.advertise_refs,
|
||||
N_("exit immediately after initial ref advertisement")),
|
||||
OPT_BOOL(0, "strict", &strict,
|
||||
N_("do not try <directory>/.git/ if <directory> is no Git directory")),
|
||||
OPT_INTEGER(0, "timeout", &opts.timeout,
|
||||
N_("interrupt transfer after <n> seconds of inactivity")),
|
||||
OPT_END()
|
||||
};
|
||||
|
||||
packet_trace_identity("upload-pack");
|
||||
check_replace_refs = 0;
|
||||
|
||||
argc = parse_options(argc, argv, NULL, options, upload_pack_usage, 0);
|
||||
|
||||
if (argc != 1)
|
||||
usage_with_options(upload_pack_usage, options);
|
||||
|
||||
if (opts.timeout)
|
||||
opts.daemon_mode = 1;
|
||||
|
||||
setup_path();
|
||||
|
||||
dir = argv[0];
|
||||
|
||||
if (!enter_repo(dir, strict))
|
||||
die("'%s' does not appear to be a git repository", dir);
|
||||
|
||||
switch (determine_protocol_version_server()) {
|
||||
case protocol_v2:
|
||||
serve_opts.advertise_capabilities = opts.advertise_refs;
|
||||
serve_opts.stateless_rpc = opts.stateless_rpc;
|
||||
serve(&serve_opts);
|
||||
break;
|
||||
case protocol_v1:
|
||||
/*
|
||||
* v1 is just the original protocol with a version string,
|
||||
* so just fall through after writing the version string.
|
||||
*/
|
||||
if (opts.advertise_refs || !opts.stateless_rpc)
|
||||
packet_write_fmt(1, "version 1\n");
|
||||
|
||||
/* fallthrough */
|
||||
case protocol_v0:
|
||||
upload_pack(&opts);
|
||||
break;
|
||||
case protocol_unknown_version:
|
||||
BUG("unknown protocol version");
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
Reference in New Issue
Block a user