From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 24 Aug 2017 17:20:02 +0000 (-0700)
Subject: Merge branch 'jc/simplify-progress'
X-Git-Tag: v2.15.0-rc0~134
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d33a43323676e110b2ad78c9baa54ec424d40d6b

Merge branch 'jc/simplify-progress'

The API to start showing progress meter after a short delay has
been simplified.

* jc/simplify-progress:
progress: simplify "delayed" progress API
---

d33a43323676e110b2ad78c9baa54ec424d40d6b
diff --cc builtin/log.c
index 25c0808409,c6362cf92e..f8cccbc964
--- a/builtin/log.c
+++ b/builtin/log.c
@@@ -1757,12 -1749,8 +1757,12 @@@ int cmd_format_patch(int argc, const ch
  		start_number--;
  	}
  	rev.add_signoff = do_signoff;
 +
 +	if (show_progress)
- 		progress = start_progress_delay(_("Generating patches"), total, 0, 2);
++		progress = start_delayed_progress(_("Generating patches"), total);
  	while (0 <= --nr) {
  		int shown;
 +		display_progress(progress, total - nr);
  		commit = list[nr];
  		rev.nr = total - nr + (start_number - 1);
  		/* Make the second and subsequent mails replies to the first */