Skip to content

Commit

Permalink
remote-bzr: fix branch names
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Felipe Contreras authored and Junio C Hamano committed May 1, 2013
1 parent 95b0c60 commit 42b48ef
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions contrib/remote-helpers/git-remote-bzr
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 42b48ef

Please sign in to comment.