From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 25 Aug 2017 21:41:11 +0000 (-0700)
Subject: Merge branch 'ls/convert-filter-progress' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ce0bb30e8f47baf4584ca9695ac7294d3aa8e311

Merge branch 'ls/convert-filter-progress' into next

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
---

ce0bb30e8f47baf4584ca9695ac7294d3aa8e311
diff --cc entry.c
index 65458f07a4,1d1a09f47e..cb291aa88b
--- a/entry.c
+++ b/entry.c
@@@ -168,6 -172,9 +172,8 @@@ int finish_delayed_checkout(struct chec
  		return errs;
  
  	dco->state = CE_RETRY;
+ 	delayed_object_count = dco->paths.nr;
 -	progress = start_progress_delay(
 -		_("Filtering content"), delayed_object_count, 50, 1);
++	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;