mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'ab/progress-cleanup'
Code clean-up. * ab/progress-cleanup: read-cache.c: don't guard calls to progress.c API
This commit is contained in:
commit
2134c3fb1f
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue