diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-06 13:40:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-06 13:40:11 -0700 |
| commit | d8d33378ed06f1dfb5118a9b961d179e55420b44 (patch) | |
| tree | f8c2ee1129c12518caf8aa2b75c0ba0ba3b04d62 /read-cache.c | |
| parent | ed45be76345454ab74454382953cb2de868c8cdb (diff) | |
| parent | c21919f1b25cf7008018e8724e92dc771057c268 (diff) | |
| download | git-d8d33378ed06f1dfb5118a9b961d179e55420b44.tar.gz | |
Merge branch 'ab/repo-settings-cleanup'
Code cleanup.
* ab/repo-settings-cleanup:
repository.h: don't use a mix of int and bitfields
repo-settings.c: simplify the setup
read-cache & fetch-negotiator: check "enum" values in switch()
environment.c: remove test-specific "ignore_untracked..." variable
wrapper.c: add x{un,}setenv(), and use xsetenv() in environment.c
Diffstat (limited to 'read-cache.c')
| -rw-r--r-- | read-cache.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/read-cache.c b/read-cache.c index f5d4385c40..b0a06db5c5 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1944,13 +1944,22 @@ static void tweak_untracked_cache(struct index_state *istate) prepare_repo_settings(r); - if (r->settings.core_untracked_cache == UNTRACKED_CACHE_REMOVE) { + switch (r->settings.core_untracked_cache) { + case UNTRACKED_CACHE_REMOVE: remove_untracked_cache(istate); - return; - } - - if (r->settings.core_untracked_cache == UNTRACKED_CACHE_WRITE) + break; + case UNTRACKED_CACHE_WRITE: add_untracked_cache(istate); + break; + case UNTRACKED_CACHE_KEEP: + /* + * Either an explicit "core.untrackedCache=keep", the + * default if "core.untrackedCache" isn't configured, + * or a fallback on an unknown "core.untrackedCache" + * value. + */ + break; + } } static void tweak_split_index(struct index_state *istate) |