[PATCH v2 6/8] remote-bzr: trivial cleanups
From: Felipe Contreras <hidden>
Date: 2016-06-15 22:57:26
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Felipe Contreras <redacted> --- 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 80ed59f..34025c3 100755
--- a/contrib/remote-helpers/git-remote-bzr
+++ b/contrib/remote-helpers/git-remote-bzr@@ -815,7 +815,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
@@ -857,12 +857,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:
@@ -872,12 +872,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.rc3.312.g47657de