From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Aug 2018 21:33:42 +0000 (-0700)
Subject: Merge branch 'ep/worktree-quiet-option'
X-Git-Tag: v2.19.0-rc1~19
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a988ce9a580bb1cae6fbeead69eff53b113a373c?hp=-c

Merge branch 'ep/worktree-quiet-option'

"git worktree" command learned "--quiet" option to make it less
verbose.

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

a988ce9a580bb1cae6fbeead69eff53b113a373c
diff --combined t/t2025-worktree-add.sh
index 166942c1bd,c674697913..07d292317c
--- a/t/t2025-worktree-add.sh
+++ b/t/t2025-worktree-add.sh
@@@ -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 &&