Merge branch 'nd/find-pack-entry-recent-cache-invalidation'
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Feb 2012 06:43:03 +0000 (22:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Feb 2012 06:43:03 +0000 (22:43 -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