@matheusbsbs / matheus-bagliano / commits / af8da89cb7
Fork 0

Fix branch detection in multi-branch imports

Signed-off-by: Simon Hausmann <shausman@trolltech.com>

Simon Hausmann committed May 21, 2007 at 23:25 UTC af8da89cb7225c7938a836de0812467c059ca52d
1 file changed +1 -1
contrib/fast-import/git-p4
+1 -1
@@ -556,7 +556,7 @@ class P4Sync(Command):
556 relPath = path[len(self.depotPath):]
557
558 for branch in self.knownBranches.keys():
559 - if relPath.startswith(branch):
559 + if relPath.startswith(branch + "/"): # add a trailing slash so that a commit into qt/4.2foo doesn't end up in qt/4.2
560 if branch not in branches:
561 branches[branch] = []
562 branches[branch].append(file)