Merge branch 'jk/maint-pack-objects-compete-with-delete' into next
commit49479e4c461e7abef4f9132fa1d8555605e41e53
authorJunio C Hamano <gitster@pobox.com>
Sun, 16 Oct 2011 04:25:42 +0000 (15 21:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 16 Oct 2011 04:25:42 +0000 (15 21:25 -0700)
tree425f977489a6f5240d577d1ad54a3a56dad14be8
parent2ff00537dc6657ae7fc24f2a1b883a589d66cc1e
parent58a6a9cc4397477a7d8b620165e651028cc0e3c9
Merge branch 'jk/maint-pack-objects-compete-with-delete' into next

* jk/maint-pack-objects-compete-with-delete:
  downgrade "packfile cannot be accessed" errors to warnings
  pack-objects: protect against disappearing packs
builtin/pack-objects.c
cache.h
sha1_file.c