Merge branch 'jk/index-pack-reduce-recheck'
commit712b351bd37d4e4676d1165993cad4cc2176b346
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2015 19:21:54 +0000 (24 12:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2015 19:21:54 +0000 (24 12:21 -0700)
treea81d157a57664f19b32d5fe9e704c3585af78b0b
parentc595cb9c4f7c5fb2b09c5f3d3c07cf4488dc7ef9
parent0eeb077be7d526635995e17808927c94c70be665
Merge branch 'jk/index-pack-reduce-recheck'

Disable "have we lost a race with competing repack?" check while
receiving a huge object transfer that runs index-pack.

* jk/index-pack-reduce-recheck:
  index-pack: avoid excessive re-reading of pack directory
builtin/index-pack.c
cache.h
sha1_file.c