diff options
author | Daniel Kutik <daniel.kutik@lavawerk.com> | 2020-05-08 13:46:51 +0800 |
---|---|---|
committer | Mike Frysinger <vapier@google.com> | 2020-05-12 16:15:01 +0000 |
commit | e7082ccb54ad870b185e99d7e39d1959c65ff899 (patch) | |
tree | 202d3b90442beba913cd8aefadaf66abeea5368c /subcmds/info.py | |
parent | dbfbcb14c162ef8233a5a13a462ba86f5b99921a (diff) | |
download | git-repo-e7082ccb54ad870b185e99d7e39d1959c65ff899.tar.gz |
repo info findRemoteLocalDiff use short branch
When running repo info -d an error would be thrown saying:
fatal: bad revision 'refs/remotes/m/refs/heads/master..'
Using the short branch name here instead, like 'refs/remotes/m/master..'
resolves this issue.
Signed-off-by: Daniel Kutik <daniel.kutik@lavawerk.com>
Change-Id: I50ea92c45c011b2c3e3a63803decb88e7837a380
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/266578
Reviewed-by: Mike Frysinger <vapier@google.com>
Diffstat (limited to 'subcmds/info.py')
-rw-r--r-- | subcmds/info.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/subcmds/info.py b/subcmds/info.py index 76f5d1d6..f4d6f98c 100644 --- a/subcmds/info.py +++ b/subcmds/info.py | |||
@@ -16,7 +16,7 @@ | |||
16 | 16 | ||
17 | from command import PagedCommand | 17 | from command import PagedCommand |
18 | from color import Coloring | 18 | from color import Coloring |
19 | from git_refs import R_M | 19 | from git_refs import R_M, R_HEADS |
20 | 20 | ||
21 | 21 | ||
22 | class _Coloring(Coloring): | 22 | class _Coloring(Coloring): |
@@ -127,7 +127,10 @@ class Info(PagedCommand): | |||
127 | if not self.opt.local: | 127 | if not self.opt.local: |
128 | project.Sync_NetworkHalf(quiet=True, current_branch_only=True) | 128 | project.Sync_NetworkHalf(quiet=True, current_branch_only=True) |
129 | 129 | ||
130 | logTarget = R_M + self.manifest.manifestProject.config.GetBranch("default").merge | 130 | branch = self.manifest.manifestProject.config.GetBranch('default').merge |
131 | if branch.startswith(R_HEADS): | ||
132 | branch = branch[len(R_HEADS):] | ||
133 | logTarget = R_M + branch | ||
131 | 134 | ||
132 | bareTmp = project.bare_git._bare | 135 | bareTmp = project.bare_git._bare |
133 | project.bare_git._bare = False | 136 | project.bare_git._bare = False |