From 5e406bb958464116e3480665a89231341706aaea Mon Sep 17 00:00:00 2001 From: tinnamchoi Date: Thu, 2 Oct 2025 20:10:36 +0800 Subject: [PATCH] fix: make `--info=progress2` consistently display time-remaining --- progress.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/progress.c b/progress.c index 87207fbfa..039c96165 100644 --- a/progress.c +++ b/progress.c @@ -94,14 +94,18 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now, int is_l if (!ph_start.time.tv_sec || !(diff = msdiff(&ph_start.time, now))) diff = 1; rate = (double) (ofs - ph_start.ofs) * 1000.0 / diff / 1024.0; - /* Switch to total time taken for our last update. */ - remain = (double) diff / 1000.0; } else { strlcpy(eol, " ", sizeof eol); /* Compute stats based on recent progress. */ if (!(diff = msdiff(&ph_list[oldest_hpos].time, now))) diff = 1; rate = (double) (ofs - ph_list[oldest_hpos].ofs) * 1000.0 / diff / 1024.0; + } + + if (!INFO_GTE(PROGRESS, 2) && is_last) { + /* Switch to total time taken for our last update. */ + remain = (double) diff / 1000.0; + } else { remain = rate ? (double) (size - ofs) / rate / 1000.0 : 0.0; }