From bee4efb8742b90db543378be97247a22773c55f1 Mon Sep 17 00:00:00 2001 From: LaMont Jones Date: Fri, 30 Sep 2022 17:46:52 +0000 Subject: subcmds: display correct path multitree messages Correct usage of project.relpath for multi manifest workspaces. Change-Id: Idc32873552fcdae6eec7b03dde2b2f31134b72fd Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/347534 Reviewed-by: Xin Li Tested-by: LaMont Jones --- subcmds/branches.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'subcmds/branches.py') diff --git a/subcmds/branches.py b/subcmds/branches.py index b89cc2f8..fcf67ef5 100644 --- a/subcmds/branches.py +++ b/subcmds/branches.py @@ -155,11 +155,11 @@ is shown, then the branch appears in all projects. if i.IsSplitCurrent or (in_cnt <= project_cnt - in_cnt): in_type = 'in' for b in i.projects: - relpath = b.project.relpath + relpath = _RelPath(b.project) if not i.IsSplitCurrent or b.current: - paths.append(_RelPath(b.project)) + paths.append(relpath) else: - non_cur_paths.append(_RelPath(b.project)) + non_cur_paths.append(relpath) else: fmt = out.notinproject in_type = 'not in' -- cgit v1.2.3-54-g00ecf