Merge branch 'nd/travis-gcc-8'

diff --git a/builtin/upload-pack.c b/builtin/upload-pack.c
index 2cb5cb35b06d9946ea7c5b3043249736b260737d..decde5a3b1b70442e1550027359dab11f4704468 100644 (file)
--- a/builtin/upload-pack.c
+++ b/builtin/upload-pack.c
@@ -1,10 +1,11 @@
 #include "cache.h"
 #include "builtin.h"
-#include "exec_cmd.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>"),
@@ -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")),
@@ -47,6 +49,11 @@ int cmd_upload_pack(int argc, const char **argv, const char *prefix)
                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,