Merge branch 'tr/unpack-entry-use-after-free-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 3 May 2013 22:18:04 +0000 (15:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 3 May 2013 22:18:04 +0000 (15:18 -0700)
* tr/unpack-entry-use-after-free-fix:
  unpack_entry: avoid freeing objects in base cache

1  2 
sha1_file.c

diff --cc sha1_file.c
Simple merge