summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-12-06 18:23:44 +0100
committerJunio C Hamano <gitster@pobox.com>2017-12-06 18:23:44 +0100
commit4c6dad0059b2b5d1ea996ccf67f93224955b07b4 (patch)
treec873cad90875dc679c722beac0abe4ddae5d25cb /Makefile
parentMerge branch 'sp/doc-info-attributes' (diff)
parentDocumentation: document Extra Parameters (diff)
downloadgit-4c6dad0059b2b5d1ea996ccf67f93224955b07b4.tar.xz
git-4c6dad0059b2b5d1ea996ccf67f93224955b07b4.zip
Merge branch 'bw/protocol-v1'
A new mechanism to upgrade the wire protocol in place is proposed and demonstrated that it works with the older versions of Git without harming them. * bw/protocol-v1: Documentation: document Extra Parameters ssh: introduce a 'simple' ssh variant i5700: add interop test for protocol transition http: tell server that the client understands v1 connect: tell server that the client understands v1 connect: teach client to recognize v1 server response upload-pack, receive-pack: introduce protocol version 1 daemon: recognize hidden request arguments protocol: introduce protocol extension mechanisms pkt-line: add packet_write function connect: in ref advertisement, shallows are last
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index e53750ca01..fef9c8d272 100644
--- a/Makefile
+++ b/Makefile
@@ -849,6 +849,7 @@ LIB_OBJS += pretty.o
LIB_OBJS += prio-queue.o
LIB_OBJS += progress.o
LIB_OBJS += prompt.o
+LIB_OBJS += protocol.o
LIB_OBJS += quote.o
LIB_OBJS += reachable.o
LIB_OBJS += read-cache.o