[PATCH v6 3/3] branch: Add an extra verbose output displaying worktree path for refs checked out in a linked worktree

[nbelakovski]

From: Nickolai Belakovski <nbelakov...@gmail.com>

---
 Documentation/git-branch.txt | 7 +++++--
 builtin/branch.c             | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index b3eca6ffdc..a1aef00af0 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -163,12 +163,15 @@ This option is only applicable in non-verbose mode.
 
 -v::
 -vv::
+-vvv::
 --verbose::
        When in list mode,
        show sha1 and commit subject line for each head, along with
        relationship to upstream branch (if any). If given twice, print
-       the name of the upstream branch, as well (see also `git remote
-       show <remote>`).
+       the path of the linked worktree, if applicable (not applicable
+       for main worktree since user's path will already be in main
+       worktree) and the name of the upstream branch, as well (see also
+       `git remote show <remote>`).
 
 -q::
 --quiet::
diff --git a/builtin/branch.c b/builtin/branch.c
index c2a86362bb..0b8ba9e4c5 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -367,9 +367,13 @@ static char *build_format(struct ref_filter *filter, int 
maxwidth, const char *r
                strbuf_addf(&local, " %s ", obname.buf);
 
                if (filter->verbose > 1)
+               {
+                       strbuf_addf(&local, 
"%%(if:notequals=*)%%(HEAD)%%(then)%%(if)%%(worktreepath)%%(then)(%s%%(worktreepath)%s)
 %%(end)%%(end)",
+                                   branch_get_color(BRANCH_COLOR_WORKTREE), 
branch_get_color(BRANCH_COLOR_RESET));
                        strbuf_addf(&local, 
"%%(if)%%(upstream)%%(then)[%s%%(upstream:short)%s%%(if)%%(upstream:track)"
                                    "%%(then): 
%%(upstream:track,nobracket)%%(end)] %%(end)%%(contents:subject)",
                                    branch_get_color(BRANCH_COLOR_UPSTREAM), 
branch_get_color(BRANCH_COLOR_RESET));
+               }
                else
                        strbuf_addf(&local, 
"%%(if)%%(upstream:track)%%(then)%%(upstream:track) 
%%(end)%%(contents:subject)");
 
-- 
2.14.2