diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-06-24 12:21:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-24 12:21:54 -0700 |
| commit | 712b351bd37d4e4676d1165993cad4cc2176b346 (patch) | |
| tree | a81d157a57664f19b32d5fe9e704c3585af78b0b /builtin | |
| parent | Merge branch 'af/tcsh-completion-noclobber' (diff) | |
| parent | index-pack: avoid excessive re-reading of pack directory (diff) | |
| download | tgif-712b351bd37d4e4676d1165993cad4cc2176b346.tar.xz | |
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
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/index-pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 2ecfbae239..48fa4724aa 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -786,7 +786,7 @@ static void sha1_object(const void *data, struct object_entry *obj_entry, assert(data || obj_entry); read_lock(); - collision_test_needed = has_sha1_file(sha1); + collision_test_needed = has_sha1_file_with_flags(sha1, HAS_SHA1_QUICK); read_unlock(); if (collision_test_needed && !data) { |