diff options
author | LaMont Jones <lamontjones@google.com> | 2022-09-30 17:46:52 +0000 |
---|---|---|
committer | LaMont Jones <lamontjones@google.com> | 2022-11-15 21:13:06 +0000 |
commit | bee4efb8742b90db543378be97247a22773c55f1 (patch) | |
tree | 78978a97939831f3d9241266f07f1e10aeca4319 /subcmds/branches.py | |
parent | f8af33c9f0ef38fbe9bd6944255738edc8d4e8c7 (diff) | |
download | git-repo-bee4efb8742b90db543378be97247a22773c55f1.tar.gz |
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 <delphij@google.com>
Tested-by: LaMont Jones <lamontjones@google.com>
Diffstat (limited to 'subcmds/branches.py')
-rw-r--r-- | subcmds/branches.py | 6 |
1 files changed, 3 insertions, 3 deletions
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. | |||
155 | if i.IsSplitCurrent or (in_cnt <= project_cnt - in_cnt): | 155 | if i.IsSplitCurrent or (in_cnt <= project_cnt - in_cnt): |
156 | in_type = 'in' | 156 | in_type = 'in' |
157 | for b in i.projects: | 157 | for b in i.projects: |
158 | relpath = b.project.relpath | 158 | relpath = _RelPath(b.project) |
159 | if not i.IsSplitCurrent or b.current: | 159 | if not i.IsSplitCurrent or b.current: |
160 | paths.append(_RelPath(b.project)) | 160 | paths.append(relpath) |
161 | else: | 161 | else: |
162 | non_cur_paths.append(_RelPath(b.project)) | 162 | non_cur_paths.append(relpath) |
163 | else: | 163 | else: |
164 | fmt = out.notinproject | 164 | fmt = out.notinproject |
165 | in_type = 'not in' | 165 | in_type = 'not in' |