From: Simon Hausmann <shausman@trolltech.com>
Date: Mon, 21 May 2007 21:25:51 +0000 (+0200)
Subject: Fix branch detection in multi-branch imports
X-Git-Tag: v1.5.3-rc0~65^2^2~76
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=af8da89cb7225c7938a836de0812467c059ca52d;p=git-core%2Fgit.git

Fix branch detection in multi-branch imports

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

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 40264cdc1..515f7a906 100755
--- 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)