Merge branch 'jk/index-pack-reduce-recheck' into maint
commitde62fe8c421344c34d375fc315f33eeb584ab538
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Jul 2015 19:21:38 +0000 (27 12:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Jul 2015 19:21:38 +0000 (27 12:21 -0700)
tree262646e6412478d81e7457c284b9b57edc6152a9
parentbb3e7b1a5505bae590b0d85a3995a61d6dd82547
parent0eeb077be7d526635995e17808927c94c70be665
Merge branch 'jk/index-pack-reduce-recheck' into maint

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