Merge branch 'maint'

* maint:
  unpack_trees(): protect the handcrafted in-core index from read_cache()
  git-p4: Fix one-liner in p4_write_pipe function.
  Completion: add missing '=' for 'diff --diff-filter'
  Fix 'git help help'
This commit is contained in:
Junio C Hamano
2008-08-23 18:28:37 -07:00
6 changed files with 10 additions and 5 deletions

View File

@ -223,7 +223,8 @@ struct index_state {
struct cache_tree *cache_tree;
time_t timestamp;
void *alloc;
unsigned name_hash_initialized : 1;
unsigned name_hash_initialized : 1,
initialized : 1;
struct hash_table name_hash;
};