pull: pass verbosity, --progress flags to fetch and merge

7f87aff (Teach/Fix pull/fetch -q/-v options, 2008-11-15) taught git-pull
to accept the verbosity -v and -q options and pass them to git-fetch and
git-merge.

Re-implement support for the verbosity flags by adding it to the options
list and introducing argv_push_verbosity() to push the flags into the
argv array used to execute git-fetch and git-merge.

9839018 (fetch and pull: learn --progress, 2010-02-24) and bebd2fd
(pull: propagate --progress to merge, 2011-02-20) taught git-pull to
accept the --progress option and pass it to git-fetch and git-merge.

Use OPT_PASSTHRU() implemented earlier to pass the "--[no-]progress"
command line options to git-fetch and git-merge.

Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/pull.c b/builtin/pull.c
index 91575361be66257b33bdaae86c429c047d652533..5d9f2b529e018b517bc001e20057fb1af6aa9e2a 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -16,10 +16,34 @@ static const char * const pull_usage[] = {
        NULL
 };
 
+/* Shared options */
+static int opt_verbosity;
+static char *opt_progress;
+
 static struct option pull_options[] = {
+       /* Shared options */
+       OPT__VERBOSITY(&opt_verbosity),
+       OPT_PASSTHRU(0, "progress", &opt_progress, NULL,
+               N_("force progress reporting"),
+               PARSE_OPT_NOARG),
+
        OPT_END()
 };
 
+/**
+ * Pushes "-q" or "-v" switches into arr to match the opt_verbosity level.
+ */
+static void argv_push_verbosity(struct argv_array *arr)
+{
+       int verbosity;
+
+       for (verbosity = opt_verbosity; verbosity > 0; verbosity--)
+               argv_array_push(arr, "-v");
+
+       for (verbosity = opt_verbosity; verbosity < 0; verbosity++)
+               argv_array_push(arr, "-q");
+}
+
 /**
  * Parses argv into [<repo> [<refspecs>...]], returning their values in `repo`
  * as a string and `refspecs` as a null-terminated array of strings. If `repo`
@@ -46,6 +70,12 @@ static int run_fetch(const char *repo, const char **refspecs)
        int ret;
 
        argv_array_pushl(&args, "fetch", "--update-head-ok", NULL);
+
+       /* Shared options */
+       argv_push_verbosity(&args);
+       if (opt_progress)
+               argv_array_push(&args, opt_progress);
+
        if (repo) {
                argv_array_push(&args, repo);
                argv_array_pushv(&args, refspecs);
@@ -65,6 +95,12 @@ static int run_merge(void)
        struct argv_array args = ARGV_ARRAY_INIT;
 
        argv_array_pushl(&args, "merge", NULL);
+
+       /* Shared options */
+       argv_push_verbosity(&args);
+       if (opt_progress)
+               argv_array_push(&args, opt_progress);
+
        argv_array_push(&args, "FETCH_HEAD");
        ret = run_command_v_opt(args.argv, RUN_GIT_CMD);
        argv_array_clear(&args);