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

diff --cc builtin/fsck.c
Simple merge

diff --cc builtin/log.c
index 25c0808409abce661d89896ceef490f15bb0b57e,c6362cf92ed799696128a5da6c802813db62fbcf..f8cccbc96403a791ff9d4641bac1c30b621c0d5e
--- 1/builtin/log.c
--- 2/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;
-               progress = start_progress_delay(_("Generating patches"), total, 0, 2);
 +
 +      if (show_progress)
++              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 */

diff --cc builtin/rev-list.c
Simple merge

diff --cc unpack-trees.c
Simple merge