Merge tag 'v2.7.6' into maint-2.8

diff --git a/test-dump-untracked-cache.c b/test-dump-untracked-cache.c
index 25d855d98b5cc718a6da63824e1c0f9ae39ab77c..0a1c28524668f02d3aa4d073c0c6991652cbf850 100644 (file)
--- a/test-dump-untracked-cache.c
+++ b/test-dump-untracked-cache.c
@@ -44,6 +44,10 @@ int main(int ac, 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;
+
        setup_git_directory();
        if (read_cache() < 0)
                die("unable to read index file");