summaryrefslogtreecommitdiff
path: root/cache.h
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 /cache.h
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 'cache.h')
-rw-r--r--cache.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index 553b04bfb8..26640b421d 100644
--- a/cache.h
+++ b/cache.h
@@ -1624,6 +1624,14 @@ extern int git_config_get_bool(const char *key, int *dest);
extern int git_config_get_bool_or_int(const char *key, int *is_bool, int *dest);
extern int git_config_get_maybe_bool(const char *key, int *dest);
extern int git_config_get_pathname(const char *key, const char **dest);
+extern int git_config_get_untracked_cache(void);
+
+/*
+ * 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!
+ */
+extern int ignore_untracked_cache_config;
struct key_value_info {
const char *filename;