Merge branch 'jk/name-hash-dirent'

* jk/name-hash-dirent:
  name-hash.c: always initialize dir_next pointer
This commit is contained in:
Junio C Hamano 2011-11-01 15:31:12 -07:00
commit b1b7cedcfe

View File

@ -74,7 +74,7 @@ static void hash_index_entry(struct index_state *istate, struct cache_entry *ce)
if (ce->ce_flags & CE_HASHED) if (ce->ce_flags & CE_HASHED)
return; return;
ce->ce_flags |= CE_HASHED; ce->ce_flags |= CE_HASHED;
ce->next = NULL; ce->next = ce->dir_next = NULL;
hash = hash_name(ce->name, ce_namelen(ce)); hash = hash_name(ce->name, ce_namelen(ce));
pos = insert_hash(hash, ce, &istate->name_hash); pos = insert_hash(hash, ce, &istate->name_hash);
if (pos) { if (pos) {