commit e7082ccb54ad870b185e99d7e39d1959c65ff899
author Daniel Kutik <daniel.kutik@lavawerk.com> Fri May 08 13:46:51 2020 +0800
committer Mike Frysinger <vapier@google.com> Tue May 12 16:15:01 2020 +0000
tree 202d3b90442beba913cd8aefadaf66abeea5368c
parent dbfbcb14c162ef8233a5a13a462ba86f5b99921a

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>

subcmds/info.py

diff --git a/subcmds/info.py b/subcmds/info.py
index 76f5d1d..f4d6f98 100644
--- a/subcmds/info.py
+++ b/subcmds/info.py
@@ -16,7 +16,7 @@
 
 from command import PagedCommand
 from color import Coloring
-from git_refs import R_M
+from git_refs import R_M, R_HEADS
 
 
 class _Coloring(Coloring):
@@ -127,7 +127,10 @@
     if not self.opt.local:
       project.Sync_NetworkHalf(quiet=True, current_branch_only=True)
 
-    logTarget = R_M + self.manifest.manifestProject.config.GetBranch("default").merge
+    branch = self.manifest.manifestProject.config.GetBranch('default').merge
+    if branch.startswith(R_HEADS):
+      branch = branch[len(R_HEADS):]
+    logTarget = R_M + branch
 
     bareTmp = project.bare_git._bare
     project.bare_git._bare = False