path: root/fetch-negotiator.c
diff options
authorÆvar Arnfjörð Bjarmason <>2018-08-01 15:18:34 (GMT)
committerJunio C Hamano <>2018-08-01 18:07:47 (GMT)
commitaf3a67de014a145216ef06b588733cd0db002990 (patch)
tree615ad6e9f1ae22040f57b2e7fba6f0489dad465b /fetch-negotiator.c
parent35e22d54ed3ee237a88c8e7ddeae7f1305011830 (diff)
negotiator: unknown fetch.negotiationAlgorithm should error out
Change the handling of fetch.negotiationAlgorithm=<str> to error out on unknown strings, i.e. everything except "default" or "skipping". This changes the behavior added in 42cc7485a2 ("negotiator/skipping: skip commits during fetch", 2018-07-16) which would ignore all unknown values and silently fall back to the "default" value. For a feature like this it's much better to produce an error than proceed. We don't want users to debug some amazingly slow fetch that should benefit from "skipping", only to find that they'd forgotten to deploy the new git version on that particular machine. Signed-off-by: Ævar Arnfjörð Bjarmason <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'fetch-negotiator.c')
1 files changed, 9 insertions, 3 deletions
diff --git a/fetch-negotiator.c b/fetch-negotiator.c
index 5d28304..d6d685c 100644
--- a/fetch-negotiator.c
+++ b/fetch-negotiator.c
@@ -6,9 +6,15 @@
void fetch_negotiator_init(struct fetch_negotiator *negotiator,
const char *algorithm)
- if (algorithm && !strcmp(algorithm, "skipping")) {
- skipping_negotiator_init(negotiator);
- return;
+ if (algorithm) {
+ if (!strcmp(algorithm, "skipping")) {
+ skipping_negotiator_init(negotiator);
+ return;
+ } else if (!strcmp(algorithm, "default")) {
+ /* Fall through to default initialization */
+ } else {
+ die("unknown fetch negotiation algorithm '%s'", algorithm);
+ }