Merge branch 'jk/index-pack-reduce-recheck' into next
commitff837056a5c79fb31ae2ac675a5cddf96c045d70
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Jun 2015 21:43:32 +0000 (16 14:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Jun 2015 21:43:32 +0000 (16 14:43 -0700)
treea44a6ca1182c98481792e80da6a86aff38858aef
parent621f205e7894c10719da8b3ee877cf6d07ccbd1a
parent0eeb077be7d526635995e17808927c94c70be665
Merge branch 'jk/index-pack-reduce-recheck' into next

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