nbelakovski@xxxxxxxxx writes:
> @@ -167,8 +167,10 @@ This option is only applicable in non-verbose mode.
> 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>`).
It is unclear what you mean by "user's path"; I take it as the
$(pwd) at least for now for the purpose of this review, but then
I am not sure if I agree with that justification part "since..."
If I start from a normal repository at /home/gitster/main.git,
create a linked worktree of it at /home/gitster/alt.git, chdir to
/home/gitster/alt.git and ask "git branch -v -v", then the branch
that is checked out in the main.git "main worktree" is not shown?
If the rule were "a branch that is checked out in one of the
worktrees connected to the repository is shown with the path to that
worktree" (i.e. no exception), I would understand it. If the rule
were "a branch that is ... (the same sentence), unless it is the
branch that is checked out in the *current* worktree", then I would
understand it too.
Puzzled.
In any case, please add a test or two to protect this feature from
unintended future breakages.
Thanks.
>
> -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)");
