mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix branch detection in multi-branch imports

Browse Source 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
This commit is contained in:
Simon Hausmann
2007-05-21 23:25:51 +02:00
parent 5834684d51
commit af8da89cb7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/fast-import/git-p4
View File

@ -556,7 +556,7 @@ class P4Sync(Command):
relPath = path[len(self.depotPath):] relPath = path[len(self.depotPath):]
for branch in self.knownBranches.keys(): for branch in self.knownBranches.keys():
if relPath.startswith(branch): if relPath.startswith(branch + "/"): # add a trailing slash so that a commit into qt/4.2foo doesn't end up in qt/4.2
if branch not in branches: if branch not in branches:
branches[branch] = [] branches[branch] = []
branches[branch].append(file) branches[branch].append(file)