summaryrefslogtreecommitdiff
path: root/builtin/upload-pack.c
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2018-03-15 17:31:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-03-15 19:01:08 (GMT)
commite52449b672210f4b49e116ca34dcd46657287f61 (patch)
treeacf2751917ca8443909296c28edcb42997ba02f2 /builtin/upload-pack.c
parent72d0ea0056b8656765748a8bdeb42ee26ee1c8dc (diff)
downloadgit-e52449b672210f4b49e116ca34dcd46657287f61.zip
git-e52449b672210f4b49e116ca34dcd46657287f61.tar.gz
git-e52449b672210f4b49e116ca34dcd46657287f61.tar.bz2
connect: request remote refs using v2
Teach the client to be able to request a remote's refs using protocol v2. This is done by having a client issue a 'ls-refs' request to a v2 server. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/upload-pack.c')
-rw-r--r--builtin/upload-pack.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/builtin/upload-pack.c b/builtin/upload-pack.c
index 8d53e97..a757df8 100644
--- a/builtin/upload-pack.c
+++ b/builtin/upload-pack.c
@@ -5,6 +5,7 @@
#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>"),
@@ -16,6 +17,7 @@ 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")),
@@ -48,11 +50,9 @@ int cmd_upload_pack(int argc, const char **argv, const char *prefix)
switch (determine_protocol_version_server()) {
case protocol_v2:
- /*
- * fetch support for protocol v2 has not been implemented yet,
- * so ignore the request to use v2 and fallback to using v0.
- */
- upload_pack(&opts);
+ serve_opts.advertise_capabilities = opts.advertise_refs;
+ serve_opts.stateless_rpc = opts.stateless_rpc;
+ serve(&serve_opts);
break;
case protocol_v1:
/*