repo-settings: consolidate some config settings

There are a few important config settings that are not loaded
during git_default_config. These are instead loaded on-demand.

Centralize these config options to a single scan, and store
all of the values in a repo_settings struct. The values for
each setting are initialized as negative to indicate "unset".

This centralization will be particularly important in a later
change to introduce "meta" config settings that change the
defaults for these config settings.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Makefile b/Makefile
index 11ccea40716d9bbcef731f093e530a9b1aee0013..032fe9b5f9552e660f40019dcbc48795219bace5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -964,6 +964,7 @@ LIB_OBJS += refspec.o
 LIB_OBJS += ref-filter.o
 LIB_OBJS += remote.o
 LIB_OBJS += replace-object.o
 LIB_OBJS += ref-filter.o
 LIB_OBJS += remote.o
 LIB_OBJS += replace-object.o

+LIB_OBJS += repo-settings.o

 LIB_OBJS += repository.o
 LIB_OBJS += rerere.o
 LIB_OBJS += resolve-undo.o
 LIB_OBJS += repository.o
 LIB_OBJS += rerere.o
 LIB_OBJS += resolve-undo.o

diff --git a/builtin/gc.c b/builtin/gc.c
index c18efadda53e54f0e80dbd16737e2d40f47fa16f..4b8fbb9965c88ae44f88e62aa30e5737d95b1cc8 100644 (file)
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -41,7 +41,6 @@ static int aggressive_depth = 50;
 static int aggressive_window = 250;
 static int gc_auto_threshold = 6700;
 static int gc_auto_pack_limit = 50;
 static int aggressive_window = 250;
 static int gc_auto_threshold = 6700;
 static int gc_auto_pack_limit = 50;

-static int gc_write_commit_graph;

 static int detach_auto = 1;
 static timestamp_t gc_log_expire_time;
 static const char *gc_log_expire = "1.day.ago";
 static int detach_auto = 1;
 static timestamp_t gc_log_expire_time;
 static const char *gc_log_expire = "1.day.ago";


@@ -148,7 +147,6 @@ static void gc_config(void)
        git_config_get_int("gc.aggressivedepth", &aggressive_depth);
        git_config_get_int("gc.auto", &gc_auto_threshold);
        git_config_get_int("gc.autopacklimit", &gc_auto_pack_limit);
        git_config_get_int("gc.aggressivedepth", &aggressive_depth);
        git_config_get_int("gc.auto", &gc_auto_threshold);
        git_config_get_int("gc.autopacklimit", &gc_auto_pack_limit);

-       git_config_get_bool("gc.writecommitgraph", &gc_write_commit_graph);

        git_config_get_bool("gc.autodetach", &detach_auto);
        git_config_get_expiry("gc.pruneexpire", &prune_expire);
        git_config_get_expiry("gc.worktreepruneexpire", &prune_worktrees_expire);
        git_config_get_bool("gc.autodetach", &detach_auto);
        git_config_get_expiry("gc.pruneexpire", &prune_expire);
        git_config_get_expiry("gc.worktreepruneexpire", &prune_worktrees_expire);


@@ -685,11 +683,11 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
                clean_pack_garbage();
        }
 
                clean_pack_garbage();
        }
 

-       if (gc_write_commit_graph &&
-           write_commit_graph_reachable(get_object_directory(),
-                                        !quiet && !daemonized ? COMMIT_GRAPH_PROGRESS : 0,
-                                        NULL))
-               return 1;
+       prepare_repo_settings(the_repository);
+       if (the_repository->settings.gc_write_commit_graph == 1)
+               write_commit_graph_reachable(get_object_directory(),
+                                            !quiet && !daemonized ? COMMIT_GRAPH_PROGRESS : 0,
+                                            NULL);

 
        if (auto_gc && too_many_loose_objects())
                warning(_("There are too many unreachable loose objects; "
 
        if (auto_gc && too_many_loose_objects())
                warning(_("There are too many unreachable loose objects; "

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 267c562b1f81dad2c42e2392a76ff0a269d38f65..f9f7181f3f8daa2a2f2c766ae09aa8941525f218 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -2709,10 +2709,6 @@ static int git_pack_config(const char *k, const char *v, void *cb)
                use_bitmap_index_default = git_config_bool(k, v);
                return 0;
        }
                use_bitmap_index_default = git_config_bool(k, v);
                return 0;
        }

-       if (!strcmp(k, "pack.usesparse")) {
-               sparse = git_config_bool(k, v);
-               return 0;
-       }

        if (!strcmp(k, "pack.threads")) {
                delta_search_threads = git_config_int(k, v);
                if (delta_search_threads < 0)
        if (!strcmp(k, "pack.threads")) {
                delta_search_threads = git_config_int(k, v);
                if (delta_search_threads < 0)


@@ -3332,6 +3328,10 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
        read_replace_refs = 0;
 
        sparse = git_env_bool("GIT_TEST_PACK_SPARSE", 0);
        read_replace_refs = 0;
 
        sparse = git_env_bool("GIT_TEST_PACK_SPARSE", 0);

+       prepare_repo_settings(the_repository);
+       if (!sparse && the_repository->settings.pack_use_sparse != -1)
+               sparse = the_repository->settings.pack_use_sparse;
+

        reset_pack_idx_option(&pack_idx_opts);
        git_config(git_pack_config, NULL);
 
        reset_pack_idx_option(&pack_idx_opts);
        git_config(git_pack_config, NULL);
 

diff --git a/commit-graph.c b/commit-graph.c
index b3c4de79b6da4502726dbec5e21b11734d76e28e..7854e491b23666d3d6dbb827d1290348b9ec14eb 100644 (file)
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -466,7 +466,6 @@ static void prepare_commit_graph_one(struct repository *r, const char *obj_dir)
 static int prepare_commit_graph(struct repository *r)
 {
        struct object_directory *odb;
 static int prepare_commit_graph(struct repository *r)
 {
        struct object_directory *odb;

-       int config_value;

 
        if (git_env_bool(GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD, 0))
                die("dying as requested by the '%s' variable on commit-graph load!",
 
        if (git_env_bool(GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD, 0))
                die("dying as requested by the '%s' variable on commit-graph load!",


@@ -476,9 +475,10 @@ static int prepare_commit_graph(struct repository *r)
                return !!r->objects->commit_graph;
        r->objects->commit_graph_attempted = 1;
 
                return !!r->objects->commit_graph;
        r->objects->commit_graph_attempted = 1;
 

+       prepare_repo_settings(r);
+

        if (!git_env_bool(GIT_TEST_COMMIT_GRAPH, 0) &&
        if (!git_env_bool(GIT_TEST_COMMIT_GRAPH, 0) &&

-           (repo_config_get_bool(r, "core.commitgraph", &config_value) ||
-           !config_value))
+           r->settings.core_commit_graph != 1)

                /*
                 * This repository is not configured to use commit graphs, so
                 * do not load one. (But report commit_graph_attempted anyway
                /*
                 * This repository is not configured to use commit graphs, so
                 * do not load one. (But report commit_graph_attempted anyway

diff --git a/read-cache.c b/read-cache.c
index c701f7f8b81378104e2732e8bb132144ff82e8f5..59dbebc15dac9dd12567acc8273b456d4e0873ea 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -1599,16 +1599,17 @@ struct cache_entry *refresh_cache_entry(struct index_state *istate,
 
 #define INDEX_FORMAT_DEFAULT 3
 
 
 #define INDEX_FORMAT_DEFAULT 3
 

-static unsigned int get_index_format_default(void)
+static unsigned int get_index_format_default(struct repository *r)

 {
        char *envversion = getenv("GIT_INDEX_VERSION");
        char *endp;
 {
        char *envversion = getenv("GIT_INDEX_VERSION");
        char *endp;

-       int value;

        unsigned int version = INDEX_FORMAT_DEFAULT;
 
        if (!envversion) {
        unsigned int version = INDEX_FORMAT_DEFAULT;
 
        if (!envversion) {

-               if (!git_config_get_int("index.version", &value))
-                       version = value;
+               prepare_repo_settings(r);
+
+               if (r->settings.index_version >= 0)
+                       version = r->settings.index_version;

                if (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
                        warning(_("index.version set, but the value is invalid.\n"
                                  "Using version %i"), INDEX_FORMAT_DEFAULT);
                if (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
                        warning(_("index.version set, but the value is invalid.\n"
                                  "Using version %i"), INDEX_FORMAT_DEFAULT);


@@ -2765,7 +2766,7 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
        }
 
        if (!istate->version) {
        }
 
        if (!istate->version) {

-               istate->version = get_index_format_default();
+               istate->version = get_index_format_default(the_repository);

                if (git_env_bool("GIT_TEST_SPLIT_INDEX", 0))
                        init_split_index(istate);
        }
                if (git_env_bool("GIT_TEST_SPLIT_INDEX", 0))
                        init_split_index(istate);
        }

diff --git a/repo-settings.c b/repo-settings.c
new file mode 100644 (file)
index 0000000..309577f
--- /dev/null
+++ b/repo-settings.c
@@ -0,0 +1,25 @@
+#include "cache.h"
+#include "config.h"
+#include "repository.h"
+
+void prepare_repo_settings(struct repository *r)
+{
+       int value;
+
+       if (r->settings.initialized)
+               return;
+
+       /* Defaults */
+       memset(&r->settings, -1, sizeof(r->settings));
+
+       if (!repo_config_get_bool(r, "core.commitgraph", &value))
+               r->settings.core_commit_graph = value;
+       if (!repo_config_get_bool(r, "gc.writecommitgraph", &value))
+               r->settings.gc_write_commit_graph = value;
+
+       if (!repo_config_get_bool(r, "index.version", &value))
+               r->settings.index_version = value;
+
+       if (!repo_config_get_bool(r, "pack.usesparse", &value))
+               r->settings.pack_use_sparse = value;
+}

diff --git a/repository.h b/repository.h
index 4fb6a5885f794dea9ff7a1ecf37f27bc34e4d218..cc285ad3278bf8ac40dfb780afa523e2ee280029 100644 (file)
--- a/repository.h
+++ b/repository.h
@@ -11,6 +11,17 @@ struct pathspec;
 struct raw_object_store;
 struct submodule_cache;
 
 struct raw_object_store;
 struct submodule_cache;
 

+struct repo_settings {
+       int initialized;
+
+       int core_commit_graph;
+       int gc_write_commit_graph;
+
+       int index_version;
+
+       int pack_use_sparse;
+};
+

 struct repository {
        /* Environment */
        /*
 struct repository {
        /* Environment */
        /*


@@ -72,6 +83,8 @@ struct repository {
         */
        char *submodule_prefix;
 
         */
        char *submodule_prefix;
 

+       struct repo_settings settings;
+

        /* Subsystems */
        /*
         * Repository's config which contains key-value pairs from the usual
        /* Subsystems */
        /*
         * Repository's config which contains key-value pairs from the usual


@@ -157,5 +170,6 @@ int repo_read_index_unmerged(struct repository *);
  */
 void repo_update_index_if_able(struct repository *, struct lock_file *);
 
  */
 void repo_update_index_if_able(struct repository *, struct lock_file *);
 

+void prepare_repo_settings(struct repository *r);

 
 #endif /* REPOSITORY_H */
 
 #endif /* REPOSITORY_H */