summaryrefslogtreecommitdiff
path: root/contrib/fast-import
diff options
context:
space:
mode:
authorPete Wyckoff <pw@padd.com>2012-01-11 23:31:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-01-12 00:35:37 (GMT)
commit43b82bd9c3a5ad597bbfc0c12a519d4053df01b8 (patch)
tree054c932ab66ba0475b07c68435ea93c5c5248203 /contrib/fast-import
parent896a681698489e7e21891076ce932a97468ca4c6 (diff)
downloadgit-43b82bd9c3a5ad597bbfc0c12a519d4053df01b8.zip
git-43b82bd9c3a5ad597bbfc0c12a519d4053df01b8.tar.gz
git-43b82bd9c3a5ad597bbfc0c12a519d4053df01b8.tar.bz2
git-p4: only a single ... wildcard is supported
Catch the case where a ... exists at the end, and also elsehwere. Reported-by: Gary Gibbons <ggibbons@perforce.com> Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/fast-import')
-rwxr-xr-xcontrib/fast-import/git-p44
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 3e1aa27..20208bf 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -1207,8 +1207,8 @@ class View(object):
die("Can't handle * wildcards in view: %s" % self.path)
triple_dot_index = self.path.find("...")
if triple_dot_index >= 0:
- if not self.path.endswith("..."):
- die("Can handle ... wildcard only at end of path: %s" %
+ if triple_dot_index != len(self.path) - 3:
+ die("Can handle only single ... wildcard, at end: %s" %
self.path)
self.ends_triple_dot = True