Code

merge-recursive: Fix support for branch names containing slashes
authorFredrik Kuivinen <freku045@student.liu.se>
Wed, 9 Nov 2005 10:42:57 +0000 (11:42 +0100)
committerJunio C Hamano <junkio@cox.net>
Wed, 9 Nov 2005 20:32:36 +0000 (12:32 -0800)
A branch name could have a slash in it.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge-recursive.py

index 36578754ce854fea5ceb457af3630e10f9be9754..90e889c300ab16681040c27ab70c43cd741ff8a0 100755 (executable)
@@ -295,6 +295,7 @@ def uniquePath(path, branch):
             else:
                 raise
 
+    branch = branch.replace('/', '_')
     newPath = path + '_' + branch
     suffix = 0
     while newPath in currentFileSet or \