summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-07-27 19:21:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-07-27 19:21:38 (GMT)
commitde62fe8c421344c34d375fc315f33eeb584ab538 (patch)
tree262646e6412478d81e7457c284b9b57edc6152a9 /builtin
parentbb3e7b1a5505bae590b0d85a3995a61d6dd82547 (diff)
parent0eeb077be7d526635995e17808927c94c70be665 (diff)
downloadgit-de62fe8c421344c34d375fc315f33eeb584ab538.zip
git-de62fe8c421344c34d375fc315f33eeb584ab538.tar.gz
git-de62fe8c421344c34d375fc315f33eeb584ab538.tar.bz2
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index cf654df..723fe8e 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) {