summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorSimon Hausmann <simon@lst.de>2007-06-11 06:54:45 (GMT)
committerSimon Hausmann <simon@lst.de>2007-06-11 06:54:45 (GMT)
commit86fda6a327ce9355ae9eab69fc7a3ec33fb5d7d1 (patch)
treeb18da52ed640b60f577c1e25147f3074b316576a /contrib
parent6e5295c4d3e4e79838d1dd7ab4a8b4965e1c7f96 (diff)
downloadgit-86fda6a327ce9355ae9eab69fc7a3ec33fb5d7d1.zip
git-86fda6a327ce9355ae9eab69fc7a3ec33fb5d7d1.tar.gz
git-86fda6a327ce9355ae9eab69fc7a3ec33fb5d7d1.tar.bz2
Fix depot-paths encoding for multi-path imports (don't split up //depot/path/foo)
Signed-off-by: Simon Hausmann <simon@lst.de>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/fast-import/git-p42
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 551573a..815d8bb 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,