diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-10-19 04:34:03 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-19 04:34:03 (GMT) |
| commit | 4d87b38e6c1a73dbe744a30b9b3cdf88e69de7b4 (patch) | |
| tree | 063642472b19f3d0e248f846df6bd14456622312 /sequencer.c | |
| parent | e27bfaaee37c4c9d7e94f945f82c3e452d2dc071 (diff) | |
| parent | ae9af12287b2c37512f12c137173dde7ea5192a0 (diff) | |
| download | git-4d87b38e6c1a73dbe744a30b9b3cdf88e69de7b4.zip git-4d87b38e6c1a73dbe744a30b9b3cdf88e69de7b4.tar.gz git-4d87b38e6c1a73dbe744a30b9b3cdf88e69de7b4.tar.bz2 | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index 83f1772..0c164d5 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))); |