diff options
| author | Simon Hausmann <simon@lst.de> | 2007-06-11 08:54:45 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon@lst.de> | 2007-06-11 08:54:45 +0200 |
| commit | 86fda6a327ce9355ae9eab69fc7a3ec33fb5d7d1 (patch) | |
| tree | b18da52ed640b60f577c1e25147f3074b316576a /contrib | |
| parent | 6e5295c4d3e4e79838d1dd7ab4a8b4965e1c7f96 (diff) | |
| download | git-86fda6a327ce9355ae9eab69fc7a3ec33fb5d7d1.tar.gz git-86fda6a327ce9355ae9eab69fc7a3ec33fb5d7d1.tar.xz | |
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-x | contrib/fast-import/git-p4 | 2 |
1 files changed, 1 insertions, 1 deletions
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, |