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)
* jk/maint-pack-objects-compete-with-delete:
  downgrade "packfile cannot be accessed" errors to warnings
  pack-objects: protect against disappearing packs

1  2 
builtin/pack-objects.c
cache.h
sha1_file.c

Simple merge
diff --cc cache.h
Simple merge
diff --cc sha1_file.c
Simple merge