From 42b48ef25d8c77f839d4a2d4cec9b65379ece63e Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Tue, 30 Apr 2013 20:10:02 -0500 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- contrib/remote-helpers/git-remote-bzr | 1 + 1 file changed, 1 insertion(+) 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