builtin/multi-pack-index.c: make '--progress' a common option

All multi-pack-index sub-commands (write, verify, repack, and expire)
support a '--progress' command-line option, despite not listing it as
one of the common options in `common_opts`.

As a result each sub-command declares its own `OPT_BIT()` for a
"--progress" command-line option. Centralize this within the
`common_opts` to avoid re-declaring it in each sub-command.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-multi-pack-index.adoc b/Documentation/git-multi-pack-index.adoc
index 2f642697e9e106c3c4c96f7c22d66aec6c7a27f4..a4550e28bedd5b5cddc5242e399afb24e20c30ea 100644 (file)
--- a/Documentation/git-multi-pack-index.adoc
+++ b/Documentation/git-multi-pack-index.adoc
@@ -18,6 +18,8 @@ Write or verify a multi-pack-index (MIDX) file.
 OPTIONS
 -------
 
+The following command-line options are applicable to all sub-commands:
+
 --object-dir=<dir>::
        Use given directory for the location of Git objects. We check
        `<dir>/packs/multi-pack-index` for the current MIDX file, and

diff --git a/builtin/multi-pack-index.c b/builtin/multi-pack-index.c
index 5f364aa816ba25d48c8f59ffd3a33c3344ce84a8..ca98d4c3ba3c2fee867cd98a98bf8e2eef2652f8 100644 (file)
--- a/builtin/multi-pack-index.c
+++ b/builtin/multi-pack-index.c
@@ -84,6 +84,8 @@ static struct option common_opts[] = {
          N_("directory"),
          N_("object directory containing set of packfile and pack-index pairs"),
          parse_object_dir),
+       OPT_BIT(0, "progress", &opts.flags, N_("force progress reporting"),
+               MIDX_PROGRESS),
        OPT_END(),
 };
 
@@ -138,8 +140,6 @@ static int cmd_multi_pack_index_write(int argc, const char **argv,
                           N_("pack for reuse when computing a multi-pack bitmap")),
                OPT_BIT(0, "bitmap", &opts.flags, N_("write multi-pack bitmap"),
                        MIDX_WRITE_BITMAP | MIDX_WRITE_REV_INDEX),
-               OPT_BIT(0, "progress", &opts.flags,
-                       N_("force progress reporting"), MIDX_PROGRESS),
                OPT_BIT(0, "incremental", &opts.flags,
                        N_("write a new incremental MIDX"), MIDX_WRITE_INCREMENTAL),
                OPT_BOOL(0, "stdin-packs", &opts.stdin_packs,
@@ -200,8 +200,6 @@ static int cmd_multi_pack_index_verify(int argc, const char **argv,
 {
        struct option *options;
        static struct option builtin_multi_pack_index_verify_options[] = {
-               OPT_BIT(0, "progress", &opts.flags,
-                       N_("force progress reporting"), MIDX_PROGRESS),
                OPT_END(),
        };
        struct odb_source *source;
@@ -231,8 +229,6 @@ static int cmd_multi_pack_index_expire(int argc, const char **argv,
 {
        struct option *options;
        static struct option builtin_multi_pack_index_expire_options[] = {
-               OPT_BIT(0, "progress", &opts.flags,
-                       N_("force progress reporting"), MIDX_PROGRESS),
                OPT_END(),
        };
        struct odb_source *source;
@@ -264,8 +260,6 @@ static int cmd_multi_pack_index_repack(int argc, const char **argv,
        static struct option builtin_multi_pack_index_repack_options[] = {
                OPT_UNSIGNED(0, "batch-size", &opts.batch_size,
                  N_("during repack, collect pack-files of smaller size into a batch that is larger than this size")),
-               OPT_BIT(0, "progress", &opts.flags,
-                 N_("force progress reporting"), MIDX_PROGRESS),
                OPT_END(),
        };
        struct odb_source *source;