summaryrefslogtreecommitdiff
path: root/git-merge-recursive.py
diff options
context:
space:
mode:
authorFredrik Kuivinen <freku045@student.liu.se>2005-11-11 23:55:36 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-12 05:14:39 (GMT)
commite9af60c88bbd152ad04640ddb93dc927fc7a10b6 (patch)
tree9440e9d9198a80e89ca9fdccd5fb97f033d842c6 /git-merge-recursive.py
parent857f26d2f41e16170e48076758d974820af685ff (diff)
downloadgit-e9af60c88bbd152ad04640ddb93dc927fc7a10b6.zip
git-e9af60c88bbd152ad04640ddb93dc927fc7a10b6.tar.gz
git-e9af60c88bbd152ad04640ddb93dc927fc7a10b6.tar.bz2
merge-recursive: Use '~' instead of '_' to separate file names from branch names
Makes it less probable that we get a clash with an existing file, furthermore Cogito already uses '~' for this purpose. 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.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index 21f1e92..1bf73f3 100755
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py
@@ -304,13 +304,13 @@ def uniquePath(path, branch):
raise
branch = branch.replace('/', '_')
- newPath = path + '_' + branch
+ newPath = path + '~' + branch
suffix = 0
while newPath in currentFileSet or \
newPath in currentDirectorySet or \
fileExists(newPath):
suffix += 1
- newPath = path + '_' + branch + '_' + str(suffix)
+ newPath = path + '~' + branch + '_' + str(suffix)
currentFileSet.add(newPath)
return newPath