Merge branch 'dl/apply-3way-diff3'

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

diff --git a/repo-settings.c b/repo-settings.c
index 3779b85c17532c7f51de0ae6e28208e3ca2c9c8e..a703e407a3f0a9c55c9a18ad1db6bf345f1165dd 100644 (file)
--- a/repo-settings.c
+++ b/repo-settings.c
@@ -22,7 +22,7 @@ void prepare_repo_settings(struct repository *r)
        UPDATE_DEFAULT_BOOL(r->settings.core_commit_graph, 1);
        UPDATE_DEFAULT_BOOL(r->settings.gc_write_commit_graph, 1);
 
-       if (!repo_config_get_bool(r, "index.version", &value))
+       if (!repo_config_get_int(r, "index.version", &value))
                r->settings.index_version = value;
        if (!repo_config_get_maybe_bool(r, "core.untrackedcache", &value)) {
                if (value == 0)
@@ -49,10 +49,14 @@ void prepare_repo_settings(struct repository *r)
                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);
 
        /* Hack for test programs like test-dump-untracked-cache */
        if (ignore_untracked_cache_config)