From: Fredrik Kuivinen <freku045@student.liu.se>
Date: Wed, 9 Nov 2005 10:42:57 +0000 (+0100)
Subject: merge-recursive: Fix support for branch names containing slashes
X-Git-Tag: v0.99.9g^2~6
X-Git-Url: https://git.octo.it/?p=git.git;a=commitdiff_plain;h=186f855fc639f2063e5f02abc75ca39464a35500

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>
---

diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index 36578754..90e889c3 100755
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py
@@ -295,6 +295,7 @@ def uniquePath(path, branch):
             else:
                 raise
 
+    branch = branch.replace('/', '_')
     newPath = path + '_' + branch
     suffix = 0
     while newPath in currentFileSet or \