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

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

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