diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-07-27 12:21:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-27 12:21:38 -0700 |
| commit | de62fe8c421344c34d375fc315f33eeb584ab538 (patch) | |
| tree | 262646e6412478d81e7457c284b9b57edc6152a9 /builtin | |
| parent | Git 2.4.6 (diff) | |
| parent | index-pack: avoid excessive re-reading of pack directory (diff) | |
| download | tgif-de62fe8c421344c34d375fc315f33eeb584ab538.tar.xz | |
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
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 cf654df09b..723fe8e11d 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -730,7 +730,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) { |