Merge branch 'rs/no-null-ptr-arith-in-fast-export'

diff --git a/serve.c b/serve.c
index 7ddcba9003aec90619ae5d0df0eee743014c0884..bda085f09c8e10314c2c497dbca978fd9241e7b5 100644 (file)
--- a/serve.c
+++ b/serve.c
@@ -4,7 +4,15 @@
 #include "pkt-line.h"
 #include "version.h"
 #include "argv-array.h"
+#include "ls-refs.h"
 #include "serve.h"
+#include "upload-pack.h"
+
+static int always_advertise(struct repository *r,
+                           struct strbuf *value)
+{
+       return 1;
+}
 
 static int agent_advertise(struct repository *r,
                           struct strbuf *value)
@@ -46,6 +54,9 @@ struct protocol_capability {
 
 static struct protocol_capability capabilities[] = {
        { "agent", agent_advertise, NULL },
+       { "ls-refs", always_advertise, ls_refs },
+       { "fetch", upload_pack_advertise, upload_pack_v2 },
+       { "server-option", always_advertise, NULL },
 };
 
 static void advertise_capabilities(void)