undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests 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
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

3
read-cache.c
View File

@ -1628,7 +1628,6 @@ int refresh_index(struct index_state *istate, unsigned int flags,
t2_sum_scan += t2_did_scan; t2_sum_scan += t2_did_scan;
if (new_entry == ce) if (new_entry == ce)
continue; continue;
if (progress)
display_progress(progress, i); display_progress(progress, i);
if (!new_entry) { if (!new_entry) {
const char *fmt; 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_lstat", t2_sum_lstat);
trace2_data_intmax("index", NULL, "refresh/sum_scan", t2_sum_scan); trace2_data_intmax("index", NULL, "refresh/sum_scan", t2_sum_scan);
trace2_region_leave("index", "refresh", NULL); trace2_region_leave("index", "refresh", NULL);
if (progress) {
display_progress(progress, istate->cache_nr); display_progress(progress, istate->cache_nr);
stop_progress(&progress); stop_progress(&progress);
}
trace_performance_leave("refresh index"); trace_performance_leave("refresh index");
return has_errors; return has_errors;
} }