diff options
| author | Pete Wyckoff <pw@padd.com> | 2012-01-11 18:31:06 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-11 16:35:37 -0800 |
| commit | 43b82bd9c3a5ad597bbfc0c12a519d4053df01b8 (patch) | |
| tree | 054c932ab66ba0475b07c68435ea93c5c5248203 /contrib | |
| parent | 896a681698489e7e21891076ce932a97468ca4c6 (diff) | |
| download | git-43b82bd9c3a5ad597bbfc0c12a519d4053df01b8.tar.gz | |
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')
| -rwxr-xr-x | contrib/fast-import/git-p4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index 3e1aa276cf..20208bfbc0 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 |