repo-settings: parse core.untrackedCache

The core.untrackedCache config setting is slightly complicated,
so clarify its use and centralize its parsing into the repo
settings.

The default value is "keep" (returned as -1), which persists the
untracked cache if it exists.

If the value is set as "false" (returned as 0), then remove the
untracked cache if it exists.

If the value is set as "true" (returned as 1), then write the
untracked cache and persist it.

Instead of relying on magic values of -1, 0, and 1, split these
options into an enum. This allows the use of "-1" as a
default value. After parsing the config options, if the value is
unset we can initialize it to UNTRACKED_CACHE_KEEP.

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

diff --git a/builtin/update-index.c b/builtin/update-index.c
index dff2f4b837208deebeb34f4af687c18df7dbfe76..49302d98c55d19651cacef7b36197de65d805e50 100644 (file)
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -966,6 +966,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
        struct parse_opt_ctx_t ctx;
        strbuf_getline_fn getline_fn;
        int parseopt_state = PARSE_OPT_UNKNOWN;
        struct parse_opt_ctx_t ctx;
        strbuf_getline_fn getline_fn;
        int parseopt_state = PARSE_OPT_UNKNOWN;

+       struct repository *r = the_repository;

        struct option options[] = {
                OPT_BIT('q', NULL, &refresh_args.flags,
                        N_("continue refresh even when index needs update"),
        struct option options[] = {
                OPT_BIT('q', NULL, &refresh_args.flags,
                        N_("continue refresh even when index needs update"),


@@ -1180,11 +1181,12 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
                remove_split_index(&the_index);
        }
 
                remove_split_index(&the_index);
        }
 

+       prepare_repo_settings(r);

        switch (untracked_cache) {
        case UC_UNSPECIFIED:
                break;
        case UC_DISABLE:
        switch (untracked_cache) {
        case UC_UNSPECIFIED:
                break;
        case UC_DISABLE:

-               if (git_config_get_untracked_cache() == 1)
+               if (r->settings.core_untracked_cache == UNTRACKED_CACHE_WRITE)

                        warning(_("core.untrackedCache is set to true; "
                                  "remove or change it, if you really want to "
                                  "disable the untracked cache"));
                        warning(_("core.untrackedCache is set to true; "
                                  "remove or change it, if you really want to "
                                  "disable the untracked cache"));


@@ -1196,7 +1198,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
                return !test_if_untracked_cache_is_supported();
        case UC_ENABLE:
        case UC_FORCE:
                return !test_if_untracked_cache_is_supported();
        case UC_ENABLE:
        case UC_FORCE:

-               if (git_config_get_untracked_cache() == 0)
+               if (r->settings.core_untracked_cache == UNTRACKED_CACHE_REMOVE)

                        warning(_("core.untrackedCache is set to false; "
                                  "remove or change it, if you really want to "
                                  "enable the untracked cache"));
                        warning(_("core.untrackedCache is set to false; "
                                  "remove or change it, if you really want to "
                                  "enable the untracked cache"));

diff --git a/config.c b/config.c
index faa57e436cf4fc6d84580f3940bafdb4896c7658..3241dbc54de47aad9845f0bf26fd29638b13e9ba 100644 (file)
--- a/config.c
+++ b/config.c
@@ -2277,30 +2277,6 @@ int git_config_get_expiry_in_days(const char *key, timestamp_t *expiry, timestam
        return -1; /* thing exists but cannot be parsed */
 }
 
        return -1; /* thing exists but cannot be parsed */
 }
 

-int git_config_get_untracked_cache(void)
-{
-       int val = -1;
-       const char *v;
-
-       /* Hack for test programs like test-dump-untracked-cache */
-       if (ignore_untracked_cache_config)
-               return -1;
-
-       if (!git_config_get_maybe_bool("core.untrackedcache", &val))
-               return val;
-
-       if (!git_config_get_value("core.untrackedcache", &v)) {
-               if (!strcasecmp(v, "keep"))
-                       return -1;
-
-               error(_("unknown core.untrackedCache value '%s'; "
-                       "using 'keep' default value"), v);
-               return -1;
-       }
-
-       return -1; /* default value */
-}
-

 int git_config_get_split_index(void)
 {
        int val;
 int git_config_get_split_index(void)
 {
        int val;

diff --git a/read-cache.c b/read-cache.c
index 59dbebc15dac9dd12567acc8273b456d4e0873ea..7a07286164f9492ebd17543c976e0931c2899b74 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -1845,18 +1845,17 @@ static void check_ce_order(struct index_state *istate)
 
 static void tweak_untracked_cache(struct index_state *istate)
 {
 
 static void tweak_untracked_cache(struct index_state *istate)
 {

-       switch (git_config_get_untracked_cache()) {
-       case -1: /* keep: do nothing */
-               break;
-       case 0: /* false */
+       struct repository *r = the_repository;
+
+       prepare_repo_settings(r);
+
+       if (r->settings.core_untracked_cache  == UNTRACKED_CACHE_REMOVE) {

                remove_untracked_cache(istate);
                remove_untracked_cache(istate);

-               break;
-       case 1: /* true */
-               add_untracked_cache(istate);
-               break;
-       default: /* unknown value: do nothing */
-               break;
+               return;

        }
        }

+
+       if (r->settings.core_untracked_cache == UNTRACKED_CACHE_WRITE)
+               add_untracked_cache(istate);

 }
 
 static void tweak_split_index(struct index_state *istate)
 }
 
 static void tweak_split_index(struct index_state *istate)

diff --git a/repo-settings.c b/repo-settings.c
index d00b675687418e7cf0915f8d577f3685fee7e507..abbc6566f8fb7da1e76f17fd1b53d0a5f4889f38 100644 (file)
--- a/repo-settings.c
+++ b/repo-settings.c
@@ -7,6 +7,7 @@
 void prepare_repo_settings(struct repository *r)
 {
        int value;
 void prepare_repo_settings(struct repository *r)
 {
        int value;

+       char *strval;

 
        if (r->settings.initialized)
                return;
 
        if (r->settings.initialized)
                return;


@@ -23,7 +24,25 @@ void prepare_repo_settings(struct repository *r)
 
        if (!repo_config_get_bool(r, "index.version", &value))
                r->settings.index_version = value;
 
        if (!repo_config_get_bool(r, "index.version", &value))
                r->settings.index_version = value;

+       if (!repo_config_get_maybe_bool(r, "core.untrackedcache", &value)) {
+               if (value == 0)
+                       r->settings.core_untracked_cache = UNTRACKED_CACHE_REMOVE;
+               else
+                       r->settings.core_untracked_cache = UNTRACKED_CACHE_WRITE;
+       } else if (!repo_config_get_string(r, "core.untrackedcache", &strval)) {
+               if (!strcasecmp(strval, "keep"))
+                       r->settings.core_untracked_cache = UNTRACKED_CACHE_KEEP;
+
+               free(strval);
+       }
+

 
        if (!repo_config_get_bool(r, "pack.usesparse", &value))
                r->settings.pack_use_sparse = value;
 
        if (!repo_config_get_bool(r, "pack.usesparse", &value))
                r->settings.pack_use_sparse = value;

+
+       /* 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);

 }
 }

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

+enum untracked_cache_setting {
+       UNTRACKED_CACHE_UNSET = -1,
+       UNTRACKED_CACHE_REMOVE = 0,
+       UNTRACKED_CACHE_KEEP = 1,
+       UNTRACKED_CACHE_WRITE = 2
+};
+

 struct repo_settings {
        int initialized;
 
 struct repo_settings {
        int initialized;
 


@@ -18,6 +25,7 @@ struct repo_settings {
        int gc_write_commit_graph;
 
        int index_version;
        int gc_write_commit_graph;
 
        int index_version;

+       enum untracked_cache_setting core_untracked_cache;

 
        int pack_use_sparse;
 };
 
        int pack_use_sparse;
 };