summaryrefslogtreecommitdiff
path: root/git-merge-recursive.py
diff options
context:
space:
mode:
authorFredrik Kuivinen <freku045@student.liu.se>2005-11-09 10:42:57 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-09 20:32:36 (GMT)
commit186f855fc639f2063e5f02abc75ca39464a35500 (patch)
tree132cf7a143b9ed08e69399da6caa0c627d26f181 /git-merge-recursive.py
parentc8a4f5e5422677b950e7e74b29fa6631fd8ce243 (diff)
downloadgit-186f855fc639f2063e5f02abc75ca39464a35500.zip
git-186f855fc639f2063e5f02abc75ca39464a35500.tar.gz
git-186f855fc639f2063e5f02abc75ca39464a35500.tar.bz2
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>
Diffstat (limited to 'git-merge-recursive.py')
-rwxr-xr-xgit-merge-recursive.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index 3657875..90e889c 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 \