summaryrefslogtreecommitdiff
path: root/contrib/fast-import
diff options
context:
space:
mode:
authorLibravatar Pete Wyckoff <pw@padd.com>2012-01-25 23:48:24 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-01-26 11:35:40 -0800
commit3558f32f1f5fdb3d566e39f6e07cd3f97d124da6 (patch)
tree85a2e7dca4a03c0fcf1ed4aa3160d218b1b07dfa /contrib/fast-import
parentgit-p4: Add test case for complex branch import (diff)
downloadtgif-3558f32f1f5fdb3d566e39f6e07cd3f97d124da6.tar.xz
git-p4: Change p4 command invocation
Change p4 command invocation to avoid going through the shell. This allows names with spaces and wildcards to work. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Vitor Antunes <vitor.hda@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/fast-import')
-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 0bf2625077..b951ce58bb 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -1984,7 +1984,7 @@ class P4Sync(Command, P4UserMap):
def importChanges(self, changes):
cnt = 1
for change in changes:
- description = p4Cmd("describe %s" % change)
+ description = p4Cmd(["describe", str(change)])
self.updateOptionDict(description)
if not self.silent: