Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-10-19 07:34:03 +0300
committerJunio C Hamano <gitster@pobox.com>2018-10-19 07:34:03 +0300
commit4d87b38e6c1a73dbe744a30b9b3cdf88e69de7b4 (patch)
tree063642472b19f3d0e248f846df6bd14456622312 /sequencer.c
parente27bfaaee37c4c9d7e94f945f82c3e452d2dc071 (diff)
parentae9af12287b2c37512f12c137173dde7ea5192a0 (diff)
Merge branch 'nd/status-refresh-progress'
"git status" learns to show progress bar when refreshing the index takes a long time. * nd/status-refresh-progress: status: show progress bar if refreshing the index takes too long
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 83f17721d4..0c164d5f98 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -1913,7 +1913,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) {
+ if (read_index_preload(&the_index, NULL, 0) < 0) {
rollback_lock_file(&index_lock);
return error(_("git %s: failed to read the index"),
_(action_name(opts)));