merge-recursive: Fix support for branch names containing slashes
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>
Fredrik Kuivinen committed
Nov 9, 2005 at 11:42 UTC
186f855fc639f2063e5f02abc75ca39464a35500
1 file changed
+1
git-merge-recursive.py
+1
@@ -295,6 +295,7 @@ def uniquePath(path, branch):
295
else:
296
raise
297
298
+ branch = branch.replace('/', '_')
299
newPath = path + '_' + branch
300
suffix = 0
301
while newPath in currentFileSet or \