Merge branch 'en/merge-ort-api-null-impl'

[thirdparty/git.git] / repo-settings.c

diff --git a/repo-settings.c b/repo-settings.c
index aa61a35338138edb31ff6791ad08d560b674c04b..f7fff0f5ab837e05cd369ed7630e8e2648e9aba8 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))
@@ -49,6 +53,11 @@ void prepare_repo_settings(struct repository *r)
                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);