From: Junio C Hamano Date: Fri, 9 Dec 2011 21:36:56 +0000 (-0800) Subject: Merge branch 'rs/allocate-cache-entry-individually' X-Git-Tag: v1.7.9-rc0~86 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ef87690b27fd1facdc8cc48f6789a930939303a3;p=git.git Merge branch 'rs/allocate-cache-entry-individually' * 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 --- ef87690b27fd1facdc8cc48f6789a930939303a3