git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb3e7b1 0eeb077)
Merge branch 'jk/index-pack-reduce-recheck' into maint
authorJunio C Hamano <redacted>
Mon, 27 Jul 2015 19:21:38 +0000 (12:21 -0700)
committerJunio C Hamano <redacted>
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 patch | diff1 | diff2 | blob | history
cache.h patch | diff1 | diff2 | blob | history
sha1_file.c patch | diff1 | diff2 | blob | history

diff --cc builtin/index-pack.c
Simple merge
diff --cc cache.h
Simple merge
diff --cc sha1_file.c
Simple merge
git clone https://git.99rst.org/PROJECT