diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-08-24 10:20:02 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-08-24 10:20:02 -0700 |
commit | d33a43323676e110b2ad78c9baa54ec424d40d6b (patch) | |
tree | 555a797278ae14639bc7a56641dc629b657949f8 /unpack-trees.c | |
parent | 6ea13d88456c116b14c3bc756993b5f462c981cb (diff) | |
parent | 8aade107dd84dcaff3f23caae80a013878db2de7 (diff) | |
download | git-d33a43323676e110b2ad78c9baa54ec424d40d6b.tar.gz |
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
Diffstat (limited to 'unpack-trees.c')
-rw-r--r-- | unpack-trees.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 5d5590eee5..78590f1bfa 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -343,8 +343,7 @@ static struct progress *get_progress(struct unpack_trees_options *o) total++; } - return start_progress_delay(_("Checking out files"), - total, 50, 1); + return start_delayed_progress(_("Checking out files"), total); } static int check_updates(struct unpack_trees_options *o) |