Merge branch 'nd/find-pack-entry-recent-cache-invalidation' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Feb 2012 22:56:36 +0000 (14:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Feb 2012 22:56:36 +0000 (14:56 -0800)
* nd/find-pack-entry-recent-cache-invalidation:
  find_pack_entry(): do not keep packed_git pointer locally
  sha1_file.c: move the core logic of find_pack_entry() into fill_pack_entry()

1  2 
sha1_file.c

diff --cc sha1_file.c
Simple merge