Merge branch 'jk/maint-pack-objects-compete-with-delete'
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 23:04:33 +0000 (16:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Oct 2011 23:04:33 +0000 (16:04 -0700)
commit207095063379065f2894c091c8909269a00ed44a
tree0e117b5b75a459622282fd65510b54978a2d2458
parente75a59adfcc4fd048690e5b25f9a8c31d8011d53
parent58a6a9cc4397477a7d8b620165e651028cc0e3c9
Merge branch 'jk/maint-pack-objects-compete-with-delete'

* 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