mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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>
This commit is contained in:
parent
857f26d2f4
commit
e9af60c88b
|
@ -304,13 +304,13 @@ def fileExists(path):
|
|||
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
|
||||
|
||||
|
|
Loading…
Reference in a new issue