packaging: Add contrib installation

[platform/upstream/git.git] / repo-settings.c

diff --git a/repo-settings.c b/repo-settings.c
index a703e40..f7fff0f 100644 (file)
--- a/repo-settings.c
+++ b/repo-settings.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 #include "config.h"
 #include "repository.h"
+#include "midx.h"
 
 #define UPDATE_DEFAULT_BOOL(s,v) do { if (s == -1) { s = v; } } while(0)
 
@@ -17,9 +18,12 @@ void prepare_repo_settings(struct repository *r)
 
        if (!repo_config_get_bool(r, "core.commitgraph", &value))
                r->settings.core_commit_graph = value;
+       if (!repo_config_get_bool(r, "commitgraph.readchangedpaths", &value))
+               r->settings.commit_graph_read_changed_paths = value;
        if (!repo_config_get_bool(r, "gc.writecommitgraph", &value))
                r->settings.gc_write_commit_graph = value;
        UPDATE_DEFAULT_BOOL(r->settings.core_commit_graph, 1);
+       UPDATE_DEFAULT_BOOL(r->settings.commit_graph_read_changed_paths, 1);
        UPDATE_DEFAULT_BOOL(r->settings.gc_write_commit_graph, 1);
 
        if (!repo_config_get_int(r, "index.version", &value))
@@ -39,25 +43,33 @@ void prepare_repo_settings(struct repository *r)
        if (!repo_config_get_string(r, "fetch.negotiationalgorithm", &strval)) {
                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
                        r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_DEFAULT;
        }
 
        if (!repo_config_get_bool(r, "pack.usesparse", &value))
                r->settings.pack_use_sparse = value;
+       UPDATE_DEFAULT_BOOL(r->settings.pack_use_sparse, 1);
+
+       value = git_env_bool(GIT_TEST_MULTI_PACK_INDEX, 0);
+       if (value || !repo_config_get_bool(r, "core.multipackindex", &value))
+               r->settings.core_multi_pack_index = value;
+       UPDATE_DEFAULT_BOOL(r->settings.core_multi_pack_index, 1);
+
        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, "fetch.writecommitgraph", &value))
                r->settings.fetch_write_commit_graph = value;
-       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);
-               UPDATE_DEFAULT_BOOL(r->settings.fetch_write_commit_graph, 1);
-       }
        UPDATE_DEFAULT_BOOL(r->settings.fetch_write_commit_graph, 0);
 
+       if (!repo_config_get_bool(r, "feature.experimental", &value) && value)
+               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;