builtin/gc: drop redundant local variable

We have two different variables that track the quietness for git-gc(1):

  - The local variable `quiet`, which we wire up.

  - The `quiet` field of `struct maintenance_run_opts`.

This leads to confusion which of these variables should be used and what
the respective effect is.

Simplify this logic by dropping the local variable in favor of the
options field.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/gc.c b/builtin/gc.c
index 54fc7f299a96432fe1a3821e59075d13a0ddfff7..7adda8d2d0d24f4fdca65c04cb3ca37c715786bb 100644 (file)
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -818,7 +818,6 @@ int cmd_gc(int argc,
           struct repository *repo UNUSED)
 {
        int aggressive = 0;
-       int quiet = 0;
        int force = 0;
        const char *name;
        pid_t pid;
@@ -831,7 +830,7 @@ int cmd_gc(int argc,
        const char *prune_expire_arg = prune_expire_sentinel;
        int ret;
        struct option builtin_gc_options[] = {
-               OPT__QUIET(&quiet, N_("suppress progress reporting")),
+               OPT__QUIET(&opts.quiet, N_("suppress progress reporting")),
                {
                        .type = OPTION_STRING,
                        .long_name = "prune",
@@ -891,7 +890,7 @@ int cmd_gc(int argc,
                if (cfg.aggressive_window > 0)
                        strvec_pushf(&repack, "--window=%d", cfg.aggressive_window);
        }
-       if (quiet)
+       if (opts.quiet)
                strvec_push(&repack, "-q");
 
        if (opts.auto_flag) {
@@ -906,7 +905,7 @@ int cmd_gc(int argc,
                        goto out;
                }
 
-               if (!quiet) {
+               if (!opts.quiet) {
                        if (opts.detach > 0)
                                fprintf(stderr, _("Auto packing the repository in background for optimum performance.\n"));
                        else
@@ -991,7 +990,7 @@ int cmd_gc(int argc,
                        strvec_pushl(&prune_cmd.args, "prune", "--expire", NULL);
                        /* run `git prune` even if using cruft packs */
                        strvec_push(&prune_cmd.args, cfg.prune_expire);
-                       if (quiet)
+                       if (opts.quiet)
                                strvec_push(&prune_cmd.args, "--no-progress");
                        if (repo_has_promisor_remote(the_repository))
                                strvec_push(&prune_cmd.args,
@@ -1019,7 +1018,7 @@ int cmd_gc(int argc,
 
        if (the_repository->settings.gc_write_commit_graph == 1)
                write_commit_graph_reachable(the_repository->objects->odb,
-                                            !quiet && !daemonized ? COMMIT_GRAPH_WRITE_PROGRESS : 0,
+                                            !opts.quiet && !daemonized ? COMMIT_GRAPH_WRITE_PROGRESS : 0,
                                             NULL);
 
        if (opts.auto_flag && too_many_loose_objects(&cfg))