From: Simon Hausmann <simon@lst.de>
Date: Mon, 11 Jun 2007 06:54:45 +0000 (+0200)
Subject: Fix depot-paths encoding for multi-path imports (don't split up //depot/path/foo)
X-Git-Tag: v1.5.3-rc0~65^2^2~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=86fda6a327ce9355ae9eab69fc7a3ec33fb5d7d1;p=git.git

Fix depot-paths encoding for multi-path imports (don't split up //depot/path/foo)

Signed-off-by: Simon Hausmann <simon@lst.de>
---

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 551573afc..815d8bbb5 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -1312,7 +1312,7 @@ class P4Sync(Command):
                                 parent = self.initialParents[branch]
                                 del self.initialParents[branch]
 
-                            self.commit(description, filesForCommit, branch, branchPrefix, parent)
+                            self.commit(description, filesForCommit, branch, [branchPrefix], parent)
                     else:
                         files = self.extractFilesFromCommit(description)
                         self.commit(description, files, self.branch, self.depotPaths,