From 186f855fc639f2063e5f02abc75ca39464a35500 Mon Sep 17 00:00:00 2001 From: Fredrik Kuivinen Date: Wed, 9 Nov 2005 11:42:57 +0100 Subject: [PATCH] merge-recursive: Fix support for branch names containing slashes A branch name could have a slash in it. Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano --- git-merge-recursive.py | 1 + 1 file changed, 1 insertion(+) 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 \ -- 2.11.0