Merge branch 'dt/remote-helper-doc-re-lock-option'

diff --git a/repo-settings.c b/repo-settings.c
index d5bf9069f4ae31a54d53823b27f702bf66fefbee..3779b85c17532c7f51de0ae6e28208e3ca2c9c8e 100644 (file)
--- a/repo-settings.c
+++ b/repo-settings.c
@@ -36,16 +36,29 @@ void prepare_repo_settings(struct repository *r)
                free(strval);
        }
 
+       if (!repo_config_get_string(r, "fetch.negotiationalgorithm", &strval)) {
+               if (!strcasecmp(strval, "skipping"))
+                       r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_SKIPPING;
+               else
+                       r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_DEFAULT;
+       }
+
        if (!repo_config_get_bool(r, "pack.usesparse", &value))
                r->settings.pack_use_sparse = value;
        if (!repo_config_get_bool(r, "feature.manyfiles", &value) && value) {
                UPDATE_DEFAULT_BOOL(r->settings.index_version, 4);
                UPDATE_DEFAULT_BOOL(r->settings.core_untracked_cache, UNTRACKED_CACHE_WRITE);
        }
+       if (!repo_config_get_bool(r, "feature.experimental", &value) && value) {
+               UPDATE_DEFAULT_BOOL(r->settings.pack_use_sparse, 1);
+               UPDATE_DEFAULT_BOOL(r->settings.fetch_negotiation_algorithm, FETCH_NEGOTIATION_SKIPPING);
+       }
 
        /* Hack for test programs like test-dump-untracked-cache */
        if (ignore_untracked_cache_config)
                r->settings.core_untracked_cache = UNTRACKED_CACHE_KEEP;
        else
                UPDATE_DEFAULT_BOOL(r->settings.core_untracked_cache, UNTRACKED_CACHE_KEEP);
+
+       UPDATE_DEFAULT_BOOL(r->settings.fetch_negotiation_algorithm, FETCH_NEGOTIATION_DEFAULT);
 }