worktree: add --quiet option

Add the '--quiet' option to git worktree, as for the other git
commands. 'add' is the only command affected by it since all other
commands, except 'list', are currently silent by default.

[jc: appiled trivial fix-up to keep the tests from touching outside
the scratch area]

Helped-by: Martin Ågren <martin.agren@gmail.com>
Helped-by: Duy Nguyen <pclouds@gmail.com>
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index 9c26be40f4412b5f0a9c478236b9d3c38fcb14ec..29a5b7e252a378b2f992bdeeb6c26cfe6f01f6b4 100644 (file)
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.txt
@@ -173,6 +173,10 @@ This can also be set up as the default behaviour by using the
        This format will remain stable across Git versions and regardless of user
        configuration.  See below for details.
 
        This format will remain stable across Git versions and regardless of user
        configuration.  See below for details.
 

+-q::
+--quiet::
+       With 'add', suppress feedback messages.
+

 -v::
 --verbose::
        With `prune`, report all removals.
 -v::
 --verbose::
        With `prune`, report all removals.

diff --git a/builtin/worktree.c b/builtin/worktree.c
index a763dbdccb490ab6707c247d618203ffd37d4052..41e7714396dc3334bcb29f2454d210d63a649243 100644 (file)
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -27,6 +27,7 @@ static const char * const worktree_usage[] = {
 struct add_opts {
        int force;
        int detach;
 struct add_opts {
        int force;
        int detach;

+       int quiet;

        int checkout;
        int keep_locked;
 };
        int checkout;
        int keep_locked;
 };


@@ -303,9 +304,13 @@ static int add_worktree(const char *path, const char *refname,
        if (!is_branch)
                argv_array_pushl(&cp.args, "update-ref", "HEAD",
                                 oid_to_hex(&commit->object.oid), NULL);
        if (!is_branch)
                argv_array_pushl(&cp.args, "update-ref", "HEAD",
                                 oid_to_hex(&commit->object.oid), NULL);

-       else
+       else {

                argv_array_pushl(&cp.args, "symbolic-ref", "HEAD",
                                 symref.buf, NULL);
                argv_array_pushl(&cp.args, "symbolic-ref", "HEAD",
                                 symref.buf, NULL);

+               if (opts->quiet)
+                       argv_array_push(&cp.args, "--quiet");
+       }
+

        cp.env = child_env.argv;
        ret = run_command(&cp);
        if (ret)
        cp.env = child_env.argv;
        ret = run_command(&cp);
        if (ret)


@@ -315,6 +320,8 @@ static int add_worktree(const char *path, const char *refname,
                cp.argv = NULL;
                argv_array_clear(&cp.args);
                argv_array_pushl(&cp.args, "reset", "--hard", NULL);
                cp.argv = NULL;
                argv_array_clear(&cp.args);
                argv_array_pushl(&cp.args, "reset", "--hard", NULL);

+               if (opts->quiet)
+                       argv_array_push(&cp.args, "--quiet");

                cp.env = child_env.argv;
                ret = run_command(&cp);
                if (ret)
                cp.env = child_env.argv;
                ret = run_command(&cp);
                if (ret)


@@ -437,6 +444,7 @@ static int add(int ac, const char **av, const char *prefix)
                OPT_BOOL(0, "detach", &opts.detach, N_("detach HEAD at named commit")),
                OPT_BOOL(0, "checkout", &opts.checkout, N_("populate the new working tree")),
                OPT_BOOL(0, "lock", &opts.keep_locked, N_("keep the new working tree locked")),
                OPT_BOOL(0, "detach", &opts.detach, N_("detach HEAD at named commit")),
                OPT_BOOL(0, "checkout", &opts.checkout, N_("populate the new working tree")),
                OPT_BOOL(0, "lock", &opts.keep_locked, N_("keep the new working tree locked")),

+               OPT__QUIET(&opts.quiet, N_("suppress progress reporting")),

                OPT_PASSTHRU(0, "track", &opt_track, NULL,
                             N_("set up tracking mode (see git-branch(1))"),
                             PARSE_OPT_NOARG | PARSE_OPT_OPTARG),
                OPT_PASSTHRU(0, "track", &opt_track, NULL,
                             N_("set up tracking mode (see git-branch(1))"),
                             PARSE_OPT_NOARG | PARSE_OPT_OPTARG),


@@ -491,8 +499,8 @@ static int add(int ac, const char **av, const char *prefix)
                        }
                }
        }
                        }
                }
        }

-
-       print_preparing_worktree_line(opts.detach, branch, new_branch, !!new_branch_force);
+       if (!opts.quiet)
+               print_preparing_worktree_line(opts.detach, branch, new_branch, !!new_branch_force);

 
        if (new_branch) {
                struct child_process cp = CHILD_PROCESS_INIT;
 
        if (new_branch) {
                struct child_process cp = CHILD_PROCESS_INIT;


@@ -500,6 +508,8 @@ static int add(int ac, const char **av, const char *prefix)
                argv_array_push(&cp.args, "branch");
                if (new_branch_force)
                        argv_array_push(&cp.args, "--force");
                argv_array_push(&cp.args, "branch");
                if (new_branch_force)
                        argv_array_push(&cp.args, "--force");

+               if (opts.quiet)
+                       argv_array_push(&cp.args, "--quiet");

                argv_array_push(&cp.args, new_branch);
                argv_array_push(&cp.args, branch);
                if (opt_track)
                argv_array_push(&cp.args, new_branch);
                argv_array_push(&cp.args, branch);
                if (opt_track)

diff --git a/t/t2025-worktree-add.sh b/t/t2025-worktree-add.sh
index be6e093142cdbeb18fa0ff155f3adf1e7a566ca2..c67469791322f5c124251f34db1a64498755bfd9 100755 (executable)
--- a/t/t2025-worktree-add.sh
+++ b/t/t2025-worktree-add.sh
@@ -252,6 +252,11 @@ test_expect_success 'add -B' '
        test_cmp_rev master^ poodle
 '
 
        test_cmp_rev master^ poodle
 '
 

+test_expect_success 'add --quiet' '
+       git worktree add --quiet another-worktree master 2>actual &&
+       test_must_be_empty actual
+'
+

 test_expect_success 'local clone from linked checkout' '
        git clone --local here here-clone &&
        ( cd here-clone && git fsck )
 test_expect_success 'local clone from linked checkout' '
        git clone --local here here-clone &&
        ( cd here-clone && git fsck )