Merge branch 'ls/convert-filter-progress'

The codepath to call external process filter for smudge/clean
operation learned to show the progress meter.

* ls/convert-filter-progress:
convert: display progress for filtered objects that have been delayed

diff --cc entry.c
index 65458f07a4453fa29731fe2b9c20848d6b192b20,1d1a09f47e80ce0eb454fbe86ab44948fac597a0..cb291aa88bf148608184edeff68943315b44e6ab
--- 1/entry.c
--- 2/entry.c
+++ b/entry.c
@@@ -168,6 -172,9 +172,8 @@@ int finish_delayed_checkout(struct chec
                return errs;
  
        dco->state = CE_RETRY;
 -      progress = start_progress_delay(
 -              _("Filtering content"), delayed_object_count, 50, 1);
+       delayed_object_count = dco->paths.nr;
++      progress = start_delayed_progress(_("Filtering content"), delayed_object_count);
        while (dco->filters.nr > 0) {
                for_each_string_list_item(filter, &dco->filters) {
                        struct string_list available_paths = STRING_LIST_INIT_NODUP;

diff --cc unpack-trees.c
Simple merge