diff options
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2018-08-01 17:18:34 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-08-01 20:07:47 +0200 |
commit | af3a67de014a145216ef06b588733cd0db002990 (patch) | |
tree | 615ad6e9f1ae22040f57b2e7fba6f0489dad465b /fetch-negotiator.c | |
parent | Merge branch 'jt/fetch-nego-tip' into ab/fetch-nego (diff) | |
download | git-af3a67de014a145216ef06b588733cd0db002990.tar.xz git-af3a67de014a145216ef06b588733cd0db002990.zip |
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 <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fetch-negotiator.c')
-rw-r--r-- | fetch-negotiator.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/fetch-negotiator.c b/fetch-negotiator.c index 5d283049f4..d6d685cba0 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); + } } default_negotiator_init(negotiator); } |