mirror of
https://github.com/git/git.git
synced 2024-12-18 14:24:11 +08:00
d64db5b334
If a builtin uses RUN_SETUP to request that git.c enter the repository directory, we'll get passed in a "prefix" variable with the path to the original directory. It's important to pass this to parse_options(), since we may use it to fix up relative OPT_FILENAME() options. Some builtins don't bother; let's make sure we do so consistently. There may not be any particular bugs fixed here; OPT_FILENAME is actually pretty rare, and none of these commands use it directly. However, this does future-proof us against somebody adding an option that uses it and creating a subtle bug that only shows up when you're in a subdirectory of the repository. In some cases, like hash-object and upload-pack, we don't specify RUN_SETUP, so we know the prefix will always be empty. It's still worth passing the variable along to keep the idiom consistent across all builtins (and of course it protects us if they ever _did_ switch to using RUN_SETUP). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
75 lines
1.9 KiB
C
75 lines
1.9 KiB
C
#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");
|
|
read_replace_refs = 0;
|
|
|
|
argc = parse_options(argc, argv, prefix, 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;
|
|
}
|