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>
git-mirror · Nov 9, 2005 · 186f855 · 186f855
1 parent c8a4f5e
commit 186f855
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/git-merge-recursive.py b/git-merge-recursive.py
@@ -295,6 +295,7 @@ def fileExists(path):
             else:
                 raise
 
+    branch = branch.replace('/', '_')
     newPath = path + '_' + branch
     suffix = 0
     while newPath in currentFileSet or \