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

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

diff --git a/read-cache.c b/read-cache.c
index 35fec468b1951cc17606fca8edc47f809471f652..8f96fd17226e26c4b8a1497aace5b9fffb664bbe 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -1244,6 +1244,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);