aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2013-04-30 20:10:02 -0500
committerJunio C Hamano <gitster@pobox.com>2013-04-30 22:06:47 -0700
commit42b48ef25d8c77f839d4a2d4cec9b65379ece63e (patch)
tree60fb134529ad20ee89f629bb72e66fe695f96d09 /contrib
parent95b0c60831148ca929e31b214ab3d29537ba20c9 (diff)
downloadgit-42b48ef25d8c77f839d4a2d4cec9b65379ece63e.tar.gz
git-42b48ef25d8c77f839d4a2d4cec9b65379ece63e.tar.xz
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>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/remote-helpers/git-remote-bzr1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr
index 3b3306181..38cec07ed 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