Merge branch 'maint'

diff --git a/unpack-trees.c b/unpack-trees.c
index 8a11622ccb58b192425b9300078e82760a6bce38..675a9998dcbab528faf2cf34ab1a66f884a36300 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -304,14 +304,8 @@ static void check_updates(struct cache_entry **src, int nr,
                                total++;
                }
 
-               /* Don't bother doing this for very small updates */
-               if (total < 250)
-                       total = 0;
-
-               if (total) {
-                       fprintf(stderr, "Checking files out...\n");
-                       start_progress(&progress, "", total);
-               }
+               start_progress_delay(&progress, "Checking %u files out...",
+                                    "", total, 50, 2);
                cnt = 0;
        }