summaryrefslogtreecommitdiff
path: root/environment.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-02-10 14:20:06 -0800
committerJunio C Hamano <gitster@pobox.com>2016-02-10 14:20:06 -0800
commit0e35fcb412965f855e5ac6f469343e2f8e28d5ae (patch)
treee7327947fac2a114a123e00b125bfd24cdc08404 /environment.c
parent81ad6a9c538bdbc24754cab577d8e480a8c5d012 (diff)
parent7c121788f4c93a29dbec0d61b3cd986a757a5077 (diff)
downloadgit-0e35fcb412965f855e5ac6f469343e2f8e28d5ae.tar.gz
Merge branch 'cc/untracked'
Update the untracked cache subsystem and change its primary UI from "git update-index" to "git config". * cc/untracked: t7063: add tests for core.untrackedCache test-dump-untracked-cache: don't modify the untracked cache config: add core.untrackedCache dir: simplify untracked cache "ident" field dir: add remove_untracked_cache() dir: add {new,add}_untracked_cache() update-index: move 'uc' var declaration update-index: add untracked cache notifications update-index: add --test-untracked-cache update-index: use enum for untracked cache options dir: free untracked cache when removing it
Diffstat (limited to 'environment.c')
-rw-r--r--environment.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/environment.c b/environment.c
index 1cc4aab4ea..6dec9d0403 100644
--- a/environment.c
+++ b/environment.c
@@ -87,6 +87,13 @@ int auto_comment_line_char;
/* Parallel index stat data preload? */
int core_preload_index = 1;
+/*
+ * This is a hack for test programs like test-dump-untracked-cache to
+ * ensure that they do not modify the untracked cache when reading it.
+ * Do not use it otherwise!
+ */
+int ignore_untracked_cache_config;
+
/* This is set by setup_git_dir_gently() and/or git_default_config() */
char *git_work_tree_cfg;
static char *work_tree;