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>
This commit is contained in:
parent
c8a4f5e542
commit
186f855fc6
@ -295,6 +295,7 @@ def uniquePath(path, branch):
|
||||
else:
|
||||
raise
|
||||
|
||||
branch = branch.replace('/', '_')
|
||||
newPath = path + '_' + branch
|
||||
suffix = 0
|
||||
while newPath in currentFileSet or \
|
||||
|
Loading…
Reference in New Issue
Block a user