From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 9 Jul 2019 22:25:33 +0000 (-0700)
Subject: Merge branch 'nb/branch-show-other-worktrees-head'
X-Git-Tag: v2.23.0-rc0~95
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/99eea645832d376a3b214b78a57adabf1fa96547

Merge branch 'nb/branch-show-other-worktrees-head'

"git branch --list" learned to show branches that are checked out
in other worktrees connected to the same repository prefixed with
'+', similar to the way the currently checked out branch is shown
with '*' in front.

* nb/branch-show-other-worktrees-head:
branch: add worktree info on verbose output
branch: update output to include worktree info
ref-filter: add worktreepath atom
---

99eea645832d376a3b214b78a57adabf1fa96547
diff --cc t/t3203-branch-output.sh
index be55148930,4bef8c7569..71818b90f0
--- a/t/t3203-branch-output.sh
+++ b/t/t3203-branch-output.sh
@@@ -136,11 -136,13 +136,14 @@@ test_expect_success 'git branch `--show
  	branch-two
  	EOF
  	git checkout branch-one &&
- 	git worktree add worktree branch-two &&
++	test_when_finished "
++		git worktree remove worktree_dir
++	" &&
+ 	git worktree add worktree_dir branch-two &&
  	{
  		git branch --show-current &&
- 		git -C worktree branch --show-current
+ 		git -C worktree_dir branch --show-current
  	} >actual &&
 -	rm -r worktree_dir &&
 -	git worktree prune &&
  	test_cmp expect actual
  '