From 42cc7485a2ec49ecc440c921d2eb0cae4da80549 Mon Sep 17 00:00:00 2001 From: Jonathan Tan Date: Mon, 16 Jul 2018 11:44:01 -0700 Subject: negotiator/skipping: skip commits during fetch Introduce a new negotiation algorithm used during fetch that skips commits in an effort to find common ancestors faster. The skips grow similarly to the Fibonacci sequence as the commit walk proceeds further away from the tips. The skips may cause unnecessary commits to be included in the packfile, but the negotiation step typically ends more quickly. Usage of this algorithm is guarded behind the configuration flag fetch.negotiationAlgorithm. Signed-off-by: Jonathan Tan Signed-off-by: Junio C Hamano --- fetch-negotiator.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'fetch-negotiator.c') diff --git a/fetch-negotiator.c b/fetch-negotiator.c index 2675d120fe..5d283049f4 100644 --- a/fetch-negotiator.c +++ b/fetch-negotiator.c @@ -1,8 +1,14 @@ #include "git-compat-util.h" #include "fetch-negotiator.h" #include "negotiator/default.h" +#include "negotiator/skipping.h" -void fetch_negotiator_init(struct fetch_negotiator *negotiator) +void fetch_negotiator_init(struct fetch_negotiator *negotiator, + const char *algorithm) { + if (algorithm && !strcmp(algorithm, "skipping")) { + skipping_negotiator_init(negotiator); + return; + } default_negotiator_init(negotiator); } -- cgit v1.2.3