Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx>
---
contrib/remote-helpers/git-remote-bzr | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr
index fdc2e69..dd3d71c 100755
--- a/contrib/remote-helpers/git-remote-bzr
+++ b/contrib/remote-helpers/git-remote-bzr
@@ -814,7 +814,7 @@ def find_branches(repo, wanted):
except bzrlib.errors.NotBranchError:
continue
else:
- yield name, branch
+ yield name, branch.base
def get_repo(url, alias):
global dirname, peer, branches
@@ -851,12 +851,12 @@ def get_repo(url, alias):
# branch
name = 'master'
- remote_branch = origin.open_branch()
+ branch = origin.open_branch().base
if not is_local:
- peers[name] = remote_branch.base
+ peers[name] = branch
- branches[name] = remote_branch.base
+ branches[name] = branch
return origin
else:
@@ -866,12 +866,12 @@ def get_repo(url, alias):
# stupid python
wanted = [e for e in wanted if e]
- for name, remote_branch in find_branches(repo, wanted):
+ for name, branch in find_branches(repo, wanted):
if not is_local:
- peers[name] = remote_branch.base
+ peers[name] = branch
- branches[name] = remote_branch.base
+ branches[name] = branch
return origin
--
1.8.3.rc2.542.g24820ba
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html