[PATCH 3/4] read-cache: avoid overlapping progress lines
From: SZEDER Gábor <hidden>
Date: 2021-06-23 21:57:52
Subsystem:
the rest · Maintainer:
Linus Torvalds
"Refresh index" in refresh_index() in 'read-cache.c' vs. "Refreshing index" in preload_index() in 'preload-index.c'. --- read-cache.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/read-cache.c b/read-cache.c
index c3fc797639..692a69f2db 100644
--- a/read-cache.c
+++ b/read-cache.c@@ -1567,10 +1567,6 @@ int refresh_index(struct index_state *istate, unsigned int flags, int t2_sum_lstat = 0; int t2_sum_scan = 0; - progress = start_delayed_progress_if_tty(_("Refresh index"), - istate->cache_nr, - flags & REFRESH_PROGRESS ? -1 : 0); - trace_performance_enter(); modified_fmt = in_porcelain ? "M\t%s\n" : "%s: needs update\n"; deleted_fmt = in_porcelain ? "D\t%s\n" : "%s: needs update\n";
@@ -1583,6 +1579,11 @@ int refresh_index(struct index_state *istate, unsigned int flags, * we only have to do the special cases that are left. */ preload_index(istate, pathspec, 0); + + progress = start_delayed_progress_if_tty(_("Refresh index"), + istate->cache_nr, + flags & REFRESH_PROGRESS ? -1 : 0); + trace2_region_enter("index", "refresh", NULL); /* TODO: audit for interaction with sparse-index. */ ensure_full_index(istate);
--
2.32.0.289.g44fbea0957