From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Wed, 1 May 2013 01:10:02 +0000 (-0500)
Subject: remote-bzr: fix branch names
X-Git-Tag: v1.8.3-rc2~11^2~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/42b48ef25d8c77f839d4a2d4cec9b65379ece63e

remote-bzr: fix branch names

When branches have '/' in their name (aka. sub-branches), bazaar seems
to choke while creating the new directory.

Also, git cannot have both 'foo' and 'foo/bar'.

So let's replace slashes with a plus sign.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr
index 3b3306181e..38cec07ed8 100755
--- a/contrib/remote-helpers/git-remote-bzr
+++ b/contrib/remote-helpers/git-remote-bzr
@@ -781,6 +781,7 @@ def get_repo(url, alias):
 
             name = repo.user_transport.relpath(branch.base)
             name = name if name != '' else 'master'
+            name = name.replace('/', '+')
 
             if not is_local:
                 peers[name] = branch