Merge branch 'wb/midx-progress'

The code to generate multi-pack index learned to show (or not to
show) progress indicators.

* wb/midx-progress:
  multi-pack-index: add [--[no-]progress] option.
  midx: honor the MIDX_PROGRESS flag in midx_repack
  midx: honor the MIDX_PROGRESS flag in verify_midx_file
  midx: add progress to expire_midx_packs
  midx: add progress to write_midx_file
  midx: add MIDX_PROGRESS flag

diff --combined builtin/repack.c
index 78b23d7a9a31f0b52f1bed09066cc036a0e42c18,397081d568c62ab50ad2e23991be3c7e5451af9b..0781763b06e80d0188acfe3c902061729b762809
--- 1/builtin/repack.c
--- 2/builtin/repack.c
+++ b/builtin/repack.c
@@@ -233,13 -233,6 +233,13 @@@ static void repack_promisor_objects(con
                /*
                 * pack-objects creates the .pack and .idx files, but not the
                 * .promisor file. Create the .promisor file, which is empty.
 +               *
 +               * NEEDSWORK: fetch-pack sometimes generates non-empty
 +               * .promisor files containing the ref names and associated
 +               * hashes at the point of generation of the corresponding
 +               * packfile, but this would not preserve their contents. Maybe
 +               * concatenate the contents of all .promisor files instead of
 +               * just creating a new empty file.
                 */
                promisor_name = mkpathdup("%s-%s.promisor", packtmp,
                                          line.buf);
@@@ -569,7 -562,7 +569,7 @@@ int cmd_repack(int argc, const char **a
        remove_temporary_files();
  
        if (git_env_bool(GIT_TEST_MULTI_PACK_INDEX, 0))
-               write_midx_file(get_object_directory());
+               write_midx_file(get_object_directory(), 0);
  
        string_list_clear(&names, 0);
        string_list_clear(&rollback, 0);