Merge branch 'en/fetch-negotiation-default-fix'
Interaction between fetch.negotiationAlgorithm and feature.experimental configuration variables has been corrected. * en/fetch-negotiation-default-fix: repo-settings: rename the traditional default fetch.negotiationAlgorithm repo-settings: fix error handling for unknown values repo-settings: fix checking for fetch.negotiationAlgorithm=default
This commit is contained in:
@ -26,7 +26,7 @@ void prepare_repo_settings(struct repository *r)
|
||||
/* Defaults */
|
||||
r->settings.index_version = -1;
|
||||
r->settings.core_untracked_cache = UNTRACKED_CACHE_KEEP;
|
||||
r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_DEFAULT;
|
||||
r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_CONSECUTIVE;
|
||||
|
||||
/* Booleans config or default, cascades to other settings */
|
||||
repo_cfg_bool(r, "feature.manyfiles", &manyfiles, 0);
|
||||
@ -81,10 +81,17 @@ void prepare_repo_settings(struct repository *r)
|
||||
}
|
||||
|
||||
if (!repo_config_get_string(r, "fetch.negotiationalgorithm", &strval)) {
|
||||
int fetch_default = r->settings.fetch_negotiation_algorithm;
|
||||
if (!strcasecmp(strval, "skipping"))
|
||||
r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_SKIPPING;
|
||||
else if (!strcasecmp(strval, "noop"))
|
||||
r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_NOOP;
|
||||
else if (!strcasecmp(strval, "consecutive"))
|
||||
r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_CONSECUTIVE;
|
||||
else if (!strcasecmp(strval, "default"))
|
||||
r->settings.fetch_negotiation_algorithm = fetch_default;
|
||||
else
|
||||
die("unknown fetch negotiation algorithm '%s'", strval);
|
||||
}
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user