diff options
| author |  Derrick Stolee <dstolee@microsoft.com> | 2019-08-13 11:37:48 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-08-13 13:33:55 -0700 |
| commit | aaf633c2ad10b47af7623c130ddfe7231658c7e4 (patch) | |
| tree | 5265b28889ee19735ff4e4e59ff6b43965dc84d1 /Documentation/config/fetch.txt | |
| parent | repo-settings: create feature.manyFiles setting (diff) | |
| download | tgif-aaf633c2ad10b47af7623c130ddfe7231658c7e4.tar.xz | |
repo-settings: create feature.experimental setting
The 'feature.experimental' setting includes config options that are
not committed to become defaults, but could use additional testing.
Update the following config settings to take new defaults, and to
use the repo_settings struct if not already using them:
* 'pack.useSparse=true'
* 'fetch.negotiationAlgorithm=skipping'
In the case of fetch.negotiationAlgorithm, the existing logic
would load the config option only when about to use the setting,
so had a die() statement on an unknown string value. This is
removed as now the config is parsed under prepare_repo_settings().
In general, this die() is probably misplaced and not valuable.
A test was removed that checked this die() statement executed.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config/fetch.txt')
| -rw-r--r-- | Documentation/config/fetch.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/config/fetch.txt b/Documentation/config/fetch.txt index ba890b5884..d402110638 100644 --- a/Documentation/config/fetch.txt +++ b/Documentation/config/fetch.txt @@ -59,7 +59,8 @@ fetch.negotiationAlgorithm:: effort to converge faster, but may result in a larger-than-necessary 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). + of its descendants). If `feature.experimental` is enabled, then this + setting defaults to "skipping". Unknown values will cause 'git fetch' to error out. + See also the `--negotiation-tip` option for linkgit:git-fetch[1]. |