diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-07-08 13:15:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-08 13:15:05 -0700 |
| commit | 2134c3fb1f51fd32f1e21c5c6925422cf8bf8891 (patch) | |
| tree | 775a62b00d3e1ed633e943009f0a9e25f2458a73 | |
| parent | Merge branch 'ab/xdiff-bug-cleanup' (diff) | |
| parent | read-cache.c: don't guard calls to progress.c API (diff) | |
| download | tgif-2134c3fb1f51fd32f1e21c5c6925422cf8bf8891.tar.xz | |
Merge branch 'ab/progress-cleanup'
Code clean-up.
* ab/progress-cleanup:
read-cache.c: don't guard calls to progress.c API
| -rw-r--r-- | read-cache.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/read-cache.c b/read-cache.c index 77961a3885..0c3ac3cefc 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1628,8 +1628,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; @@ -1664,10 +1663,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; } |