OSDN Git Service

Fix depot-paths encoding for multi-path imports (don't split up //depot/path/foo)
authorSimon Hausmann <simon@lst.de>
Mon, 11 Jun 2007 06:54:45 +0000 (08:54 +0200)
committerSimon Hausmann <simon@lst.de>
Mon, 11 Jun 2007 06:54:45 +0000 (08:54 +0200)
Signed-off-by: Simon Hausmann <simon@lst.de>
contrib/fast-import/git-p4

index 551573a..815d8bb 100755 (executable)
@@ -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,