Merge branch 'tb/config-default'

diff --git a/serve.c b/serve.c
index 1cb5fb9b5b57de77b3b7d40301e67912b07a8849..bda085f09c8e10314c2c497dbca978fd9241e7b5 100644 (file)
--- a/serve.c
+++ b/serve.c
@@ -6,6 +6,7 @@
 #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)
@@ -54,6 +55,8 @@ 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)