summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof.johansson@sonymobile.com>2013-01-29 08:22:05 +0100
committerDavid Pursehouse <david.pursehouse@sonymobile.com>2013-01-29 18:18:20 +0900
commit57bd7b717ba830753b5c6d82bb84d38047dce637 (patch)
tree7250e64bb16febe8bd677ce5149edde80f74178d
parent4e46520362e4c75ae7809c74f3d1c21e86852ee8 (diff)
downloadgit-repo-57bd7b717ba830753b5c6d82bb84d38047dce637.tar.gz
Fix: GitError when using repo info -d
If a workspace is initialised with: repo init -u git://path/to/manifest -b manifest-branch and the default.xml specifies the default revision as `other-branch`, running `repo info -d` results in a GitError: fatal: bad revision 'refs/remotes/m/other-branch..' The repo info command uses the default revision to build the symlink to the remote revision which is passed to the `git rev-list` command. This is incorrect; the manifest's branch name should be used. Change-Id: Ibae5b91869848276785facfaef433e38d49fd726
-rw-r--r--subcmds/info.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/subcmds/info.py b/subcmds/info.py
index d2d4f5e9..a6eba889 100644
--- a/subcmds/info.py
+++ b/subcmds/info.py
@@ -111,7 +111,7 @@ class Info(PagedCommand):
111 if not self.opt.local: 111 if not self.opt.local:
112 project.Sync_NetworkHalf(quiet=True, current_branch_only=True) 112 project.Sync_NetworkHalf(quiet=True, current_branch_only=True)
113 113
114 logTarget = R_M + self.manifest.default.revisionExpr 114 logTarget = R_M + self.manifest.manifestProject.config.GetBranch("default").merge
115 115
116 bareTmp = project.bare_git._bare 116 bareTmp = project.bare_git._bare
117 project.bare_git._bare = False 117 project.bare_git._bare = False