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

diff --cc Documentation/git-branch.txt
Simple merge

diff --cc builtin/branch.c
Simple merge

diff --cc ref-filter.c
Simple merge

diff --cc t/t3200-branch.sh
Simple merge

diff --cc t/t3203-branch-output.sh
index be5514893030313bbe08b9041b9e3d85f7fbde2b,4bef8c75697d1725c6068091f045e71753951fda..71818b90f00d3727cb00e24da181fc9dec420f08
--- 1/t/t3203-branch-output.sh
--- 2/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
  '