Merge branch 'jc/maint-name-hash-clear'

* jc/maint-name-hash-clear:
discard_cache: reset lazy name_hash bit

diff --git a/read-cache.c b/read-cache.c
index 5150c1e14b7384bd443bffb17da2887394237c61..5b1b3ad03b6d7294ca06b5b1053799958ad831c7 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -1253,6 +1253,7 @@ int discard_index(struct index_state *istate)
        istate->cache_nr = 0;
        istate->cache_changed = 0;
        istate->timestamp = 0;
+       istate->name_hash_initialized = 0;
        free_hash(&istate->name_hash);
        cache_tree_free(&(istate->cache_tree));
        free(istate->alloc);