development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-25 02:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ab/progress-cleanup'

Browse source 
Code clean-up.

* ab/progress-cleanup:
  read-cache.c: don't guard calls to progress.c API
This commit is contained in:
Junio C Hamano 2021-07-08 13:15:04 -07:00
parent 8e48f115aa b7b793d1e7
commit 2134c3fb1f
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
read-cache.c
View file

@ -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;
}