[PATCH 1/2] read-cache.c: don't guard calls to progress.c API
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Jun 7, 2021, 14:43 UTC
- Message-ID
- <patch-1.2-1680109655-20210607T144206Z-avarab@gmail.com>
- In-Reply-To
- <cover-0.2-0000000000-20210607T144206Z-avarab@gmail.com>
Don't guard the calls to the progress.c API with "if (progress)". The API itself will check this. This doesn't change any behavior, but makes this code consistent with the rest of the codebase.
See ae9af12287b (status: show progress bar if refreshing the index takes too long, 2018-09-15) for the commit that added the pattern we're changing here.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- read-cache.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/read-cache.c b/read-cache.c index 1b3c2eb408..470f800855 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1627,8 +1627,7 @@ int refresh_index(struct index_state *istate, unsigned int flags, t2_sum_scan += t2_did_scan; if (new_entry == ce) continue; - if (progress) - display_progress(progress, i); + display_progress(progress, i); if (!new_entry) { const char *fmt; @@ -1663,10 +1662,8 @@ int refresh_index(struct index_state *istate, unsigned int flags, trace2_data_intmax("index", NULL, "refresh/sum_lstat", t2_sum_lstat); trace2_data_intmax("index", NULL, "refresh/sum_scan", t2_sum_scan); trace2_region_leave("index", "refresh", NULL); - if (progress) { - display_progress(progress, istate->cache_nr); - stop_progress(&progress); - } + display_progress(progress, istate->cache_nr); + stop_progress(&progress); trace_performance_leave("refresh index"); return has_errors; }
-- 2.32.0.rc3.434.gd8aed1f08a7