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 /t | |
| parent | Merge branch 'jk/grep-haystack-is-read-only' (diff) | |
| parent | repository.h: don't use a mix of int and bitfields (diff) | |
| download | tgif-d8d33378ed06f1dfb5118a9b961d179e55420b44.tar.xz | |
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 't')
| -rw-r--r-- | t/helper/test-dump-untracked-cache.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/helper/test-dump-untracked-cache.c b/t/helper/test-dump-untracked-cache.c index cf0f2c7228..99010614f6 100644 --- a/t/helper/test-dump-untracked-cache.c +++ b/t/helper/test-dump-untracked-cache.c @@ -45,8 +45,10 @@ int cmd__dump_untracked_cache(int ac, const char **av) struct untracked_cache *uc; struct strbuf base = STRBUF_INIT; - /* Hack to avoid modifying the untracked cache when we read it */ - ignore_untracked_cache_config = 1; + /* Set core.untrackedCache=keep before setup_git_directory() */ + xsetenv("GIT_CONFIG_COUNT", "1", 1); + xsetenv("GIT_CONFIG_KEY_0", "core.untrackedCache", 1); + xsetenv("GIT_CONFIG_VALUE_0", "keep", 1); setup_git_directory(); if (read_cache() < 0) |