Fix branch detection in multi-branch imports

[git.git] / contrib / fast-import / git-p4

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 40264cdc18187719d0d751977ebce0936583f8d9..515f7a906ff1f83621a1b917a7ead4ff0fc1eeac 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -556,7 +556,7 @@ class P4Sync(Command):
             relPath = path[len(self.depotPath):]
 
             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:
                         branches[branch] = []
                     branches[branch].append(file)