Code

Merge branch 'rs/allocate-cache-entry-individually'
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Dec 2011 21:36:56 +0000 (13:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Dec 2011 21:36:56 +0000 (13:36 -0800)
* rs/allocate-cache-entry-individually:
  cache.h: put single NUL at end of struct cache_entry
  read-cache.c: allocate index entries individually

Conflicts:
read-cache.c

1  2 
read-cache.c

diff --cc read-cache.c
Simple merge