diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2013-05-24 21:24:24 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-28 07:43:18 -0700 |
| commit | a8ffc3ade273c5d6b2383450f1b4970c2da89d7d (patch) | |
| tree | c69fb3e5e29a328092a63f4a3beef1b43324e2f6 | |
| parent | 0454c399c9ce75bbdf7d35223845cfc98f51d5d9 (diff) | |
| download | git-a8ffc3ade273c5d6b2383450f1b4970c2da89d7d.tar.gz git-a8ffc3ade273c5d6b2383450f1b4970c2da89d7d.tar.xz | |
remote-bzr: trivial cleanups
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | contrib/remote-helpers/git-remote-bzr | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr index 80ed59f43..34025c3be 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 |