builtin/multi-pack-index.c: disable top-level --[no-]progress

[thirdparty/git.git] / builtin / multi-pack-index.c

diff --git a/builtin/multi-pack-index.c b/builtin/multi-pack-index.c
index 649aa5f9ab2d214e7486f3fbb80a1d9254ec1edd..5f11a3067da392379fc52afaebbe72f81f8ccf01 100644 (file)
--- a/builtin/multi-pack-index.c
+++ b/builtin/multi-pack-index.c
@@ -52,7 +52,6 @@ static struct opts_multi_pack_index {
 static struct option common_opts[] = {
        OPT_FILENAME(0, "object-dir", &opts.object_dir,
          N_("object directory containing set of packfile and pack-index pairs")),
-       OPT_BIT(0, "progress", &opts.flags, N_("force progress reporting"), MIDX_PROGRESS),
        OPT_END(),
 };
 
@@ -68,6 +67,8 @@ static int cmd_multi_pack_index_write(int argc, const char **argv)
                OPT_STRING(0, "preferred-pack", &opts.preferred_pack,
                           N_("preferred-pack"),
                           N_("pack for reuse when computing a multi-pack bitmap")),
+               OPT_BIT(0, "progress", &opts.flags,
+                       N_("force progress reporting"), MIDX_PROGRESS),
                OPT_END(),
        };
 
@@ -75,6 +76,8 @@ static int cmd_multi_pack_index_write(int argc, const char **argv)
 
        trace2_cmd_mode(argv[0]);
 
+       if (isatty(2))
+               opts.flags |= MIDX_PROGRESS;
        argc = parse_options(argc, argv, NULL,
                             options, builtin_multi_pack_index_write_usage,
                             PARSE_OPT_KEEP_UNKNOWN);
@@ -90,10 +93,18 @@ static int cmd_multi_pack_index_write(int argc, const char **argv)
 
 static int cmd_multi_pack_index_verify(int argc, const char **argv)
 {
-       struct option *options = common_opts;
+       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(),
+       };
+       options = add_common_options(builtin_multi_pack_index_verify_options);
 
        trace2_cmd_mode(argv[0]);
 
+       if (isatty(2))
+               opts.flags |= MIDX_PROGRESS;
        argc = parse_options(argc, argv, NULL,
                             options, builtin_multi_pack_index_verify_usage,
                             PARSE_OPT_KEEP_UNKNOWN);
@@ -106,10 +117,18 @@ static int cmd_multi_pack_index_verify(int argc, const char **argv)
 
 static int cmd_multi_pack_index_expire(int argc, const char **argv)
 {
-       struct option *options = common_opts;
+       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(),
+       };
+       options = add_common_options(builtin_multi_pack_index_expire_options);
 
        trace2_cmd_mode(argv[0]);
 
+       if (isatty(2))
+               opts.flags |= MIDX_PROGRESS;
        argc = parse_options(argc, argv, NULL,
                             options, builtin_multi_pack_index_expire_usage,
                             PARSE_OPT_KEEP_UNKNOWN);
@@ -126,6 +145,8 @@ static int cmd_multi_pack_index_repack(int argc, const char **argv)
        static struct option builtin_multi_pack_index_repack_options[] = {
                OPT_MAGNITUDE(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(),
        };
 
@@ -133,6 +154,8 @@ static int cmd_multi_pack_index_repack(int argc, const char **argv)
 
        trace2_cmd_mode(argv[0]);
 
+       if (isatty(2))
+               opts.flags |= MIDX_PROGRESS;
        argc = parse_options(argc, argv, NULL,
                             options,
                             builtin_multi_pack_index_repack_usage,
@@ -154,8 +177,6 @@ int cmd_multi_pack_index(int argc, const char **argv,
 
        git_config(git_default_config, NULL);
 
-       if (isatty(2))
-               opts.flags |= MIDX_PROGRESS;
        argc = parse_options(argc, argv, prefix,
                             builtin_multi_pack_index_options,
                             builtin_multi_pack_index_usage,