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 /Documentation | |
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 'Documentation')
-rw-r--r-- | Documentation/config.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 53443fb9db..46e0400e24 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1496,9 +1496,10 @@ fetch.negotiationAlgorithm:: sent when negotiating the contents of the packfile to be sent by the server. Set to "skipping" to use an algorithm that skips commits in an effort to converge faster, but may result in a larger-than-necessary - packfile; any other value instructs Git to use the default algorithm + packfile; The default is "default" which instructs Git to use the default algorithm that never skips commits (unless the server has acknowledged it or one of its descendants). + Unknown values will cause 'git fetch' to error out. format.attach:: Enable multipart/mixed attachments as the default for |