f234da8019
The "advertise capabilities" mode of serve.c added ined10cb952d(serve: introduce git-serve, 2018-03-15) is only used by the http-backend.c to call {upload,receive}-pack with the --advertise-refs parameter. See42526b478e(Add stateless RPC options to upload-pack, receive-pack, 2009-10-30). Let's just make cmd_upload_pack() take the two (v2) or three (v2) parameters the the v2/v1 servicing functions need directly, and pass those in via the function signature. The logic of whether daemon mode is implied by the timeout belongs in the v1 function (only used there). Once we split up the "advertise v2 refs" from "serve v2 request" it becomes clear that v2 never cared about those in combination. The only time it mattered was for v1 to emit its ref advertisement, in that case we wanted to emit the smart-http-only "no-done" capability. Since we only do that in the --advertise-refs codepath let's just have it set "do_done" itself in v1's upload_pack() just before send_ref(), at that point --advertise-refs and --stateless-rpc in combination are redundant (the only user is get_info_refs() in http-backend.c), so we can just pass in --advertise-refs only. Since we need to touch all the serve() and advertise_capabilities() codepaths let's rename them to less clever and obvious names, it's been suggested numerous times, the latest of which is [1]'s suggestion for protocol_v2_serve_loop(). Let's go with that. 1. https://lore.kernel.org/git/CAFQ2z_NyGb8rju5CKzmo6KhZXD0Dp21u-BbyCb2aNxLEoSPRJw@mail.gmail.com/ Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
36 lines
922 B
C
36 lines
922 B
C
#include "test-tool.h"
|
|
#include "cache.h"
|
|
#include "parse-options.h"
|
|
#include "serve.h"
|
|
|
|
static char const * const serve_usage[] = {
|
|
N_("test-tool serve-v2 [<options>]"),
|
|
NULL
|
|
};
|
|
|
|
int cmd__serve_v2(int argc, const char **argv)
|
|
{
|
|
int stateless_rpc = 0;
|
|
int advertise_capabilities = 0;
|
|
struct option options[] = {
|
|
OPT_BOOL(0, "stateless-rpc", &stateless_rpc,
|
|
N_("quit after a single request/response exchange")),
|
|
OPT_BOOL(0, "advertise-capabilities", &advertise_capabilities,
|
|
N_("exit immediately after advertising capabilities")),
|
|
OPT_END()
|
|
};
|
|
const char *prefix = setup_git_directory();
|
|
|
|
/* ignore all unknown cmdline switches for now */
|
|
argc = parse_options(argc, argv, prefix, options, serve_usage,
|
|
PARSE_OPT_KEEP_DASHDASH |
|
|
PARSE_OPT_KEEP_UNKNOWN);
|
|
|
|
if (advertise_capabilities)
|
|
protocol_v2_advertise_capabilities();
|
|
else
|
|
protocol_v2_serve_loop(stateless_rpc);
|
|
|
|
return 0;
|
|
}
|