summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-08-02 22:30:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-02 22:30:46 (GMT)
commit7c85ee6c5818f4409a29e40cc406ef5db9560af8 (patch)
tree3ae0b2267d235f9bf4f81dd1a7d781e980a953ce /Makefile
parentd6873a396e054d814744f8943fd1c343ecf4a9dc (diff)
parent42cc7485a2ec49ecc440c921d2eb0cae4da80549 (diff)
downloadgit-7c85ee6c5818f4409a29e40cc406ef5db9560af8.zip
git-7c85ee6c5818f4409a29e40cc406ef5db9560af8.tar.gz
git-7c85ee6c5818f4409a29e40cc406ef5db9560af8.tar.bz2
Merge branch 'jt/fetch-negotiator-skipping'
Add a server-side knob to skip commits in exponential/fibbonacci stride in an attempt to cover wider swath of history with a smaller number of iterations, potentially accepting a larger packfile transfer, instead of going back one commit a time during common ancestor discovery during the "git fetch" transaction. * jt/fetch-negotiator-skipping: negotiator/skipping: skip commits during fetch
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index ab5f603..74588d3 100644
--- a/Makefile
+++ b/Makefile
@@ -893,6 +893,7 @@ LIB_OBJS += merge-recursive.o
LIB_OBJS += mergesort.o
LIB_OBJS += name-hash.o
LIB_OBJS += negotiator/default.o
+LIB_OBJS += negotiator/skipping.o
LIB_OBJS += notes.o
LIB_OBJS += notes-cache.o
LIB_OBJS += notes-merge.o