Merge branch 'ep/worktree-quiet-option'
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Aug 2018 21:33:42 +0000 (14:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Aug 2018 21:33:42 +0000 (14:33 -0700)
"git worktree" command learned "--quiet" option to make it less
verbose.

* ep/worktree-quiet-option:
worktree: add --quiet option

1  2 
t/t2025-worktree-add.sh
diff --combined t/t2025-worktree-add.sh
index 166942c1bd2943b778b7df66e21d2e84861ef958,c67469791322f5c124251f34db1a64498755bfd9..07d292317cdfcbca784a19c6c8f130d09c98fe98
@@@ -252,6 -252,11 +252,11 @@@ test_expect_success 'add -B' 
        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 )
@@@ -412,8 -417,9 +417,8 @@@ test_expect_success '"add" <path> <bran
                git fetch repo_upstream2 &&
                test_must_fail git worktree add ../foo foo &&
                git -c checkout.defaultRemote=repo_upstream worktree add ../foo foo &&
 -              >status.expect &&
                git status -uno --porcelain >status.actual &&
 -              test_cmp status.expect status.actual
 +              test_must_be_empty status.actual
        ) &&
        (
                cd foo &&