summaryrefslogtreecommitdiff
path: root/sequencer.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-11-13 13:37:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-11-13 13:37:26 (GMT)
commit11aa560de964e800aabce446d600ab0fb4c90c20 (patch)
tree3762ed62fab19d43f05030f44a9ec6edef978f25 /sequencer.c
parent409b3f287b63a4c911a6b3db6d31145a0fe981a1 (diff)
parent6c5b7f55a845bccf7b3abda92a78c621898d838d (diff)
downloadgit-11aa560de964e800aabce446d600ab0fb4c90c20.zip
git-11aa560de964e800aabce446d600ab0fb4c90c20.tar.gz
git-11aa560de964e800aabce446d600ab0fb4c90c20.tar.bz2
Merge branch 'bp/refresh-index-using-preload'
The helper function to refresh the cached stat information in the in-core index has learned to perform the lstat() part of the operation in parallel on multi-core platforms. * bp/refresh-index-using-preload: refresh_index: remove unnecessary calls to preload_index() speed up refresh_index() by utilizing preload_index()
Diffstat (limited to 'sequencer.c')
-rw-r--r--sequencer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c
index 63a2094..0d87b07 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -1969,7 +1969,7 @@ static int read_and_refresh_cache(struct replay_opts *opts)
{
struct lock_file index_lock = LOCK_INIT;
int index_fd = hold_locked_index(&index_lock, 0);
- if (read_index_preload(&the_index, NULL, 0) < 0) {
+ if (read_index(&the_index) < 0) {
rollback_lock_file(&index_lock);
return error(_("git %s: failed to read the index"),
_(action_name(opts)));