[PATCH 0/2] fix v2.15 progress regression

From: Jeff King <peff@peff.net>
Date: Dec 4, 2017, 22:02 UTC
Message-ID: <20171204220228.GA29422@sigill.intra.peff.net>
In-Reply-To: <xmqqvahmkwbi.fsf@gitster.mtv.corp.google.com>

On Mon, Dec 04, 2017 at 01:38:41PM -0800, Junio C Hamano wrote:

Show 18 quoted lines

> Jeff King <peff@peff.net> writes:
> 
> > So the minimal fix is actually:
> >
> > diff --git a/progress.c b/progress.c
> > index 289678d43d..b774cb1cd1 100644
> > --- a/progress.c
> > +++ b/progress.c
> > @@ -229,7 +229,7 @@ static struct progress *start_progress_delay(const char *title, unsigned total,
> >  
> >  struct progress *start_delayed_progress(const char *title, unsigned total)
> >  {
> > -	return start_progress_delay(title, total, 0, 2);
> > +	return start_progress_delay(title, total, 100, 2);
> >  }
> 
> That makes a lot more sense to me (at least from a cursory
> comparison between the two approaches).

Here's what I think we should do: fix the bug in the minimal way, and then drop the useless code. It's worth doing in two steps, because we may decide to resurrect the feature later, and it would then just be a straight revert of the second commit.

  [1/2]: progress: set default delay threshold to 100%, not 0%
  [2/2]: progress: drop delay-threshold code

 progress.c | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

This regression is in v2.15, so this probably ought to go to maint (at least the first part, though I think the second should have no user-visible effects).

-Peff