summaryrefslogtreecommitdiff
path: root/contrib/fast-import/git-p4
diff options
context:
space:
mode:
authorGary Gibbons <ggibbons@perforce.com>2012-01-02 23:05:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-01-03 22:10:02 (GMT)
commitb10048d0e9c4a209997c3b7f44021af15f88d768 (patch)
tree2f385d52c8bb11a90346ba96916bf88008d4dd0a /contrib/fast-import/git-p4
parentc700b684cf879f80d5e9e918210475b02339fc29 (diff)
downloadgit-b10048d0e9c4a209997c3b7f44021af15f88d768.zip
git-b10048d0e9c4a209997c3b7f44021af15f88d768.tar.gz
git-b10048d0e9c4a209997c3b7f44021af15f88d768.tar.bz2
git-p4: fix test for unsupported P4 Client Views
Change re method in test for unsupported Client View types (containing %% or *) anywhere in the string rather than at the begining. [pw: two tests now succeed] Signed-off-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/git-p4')
-rwxr-xr-xcontrib/fast-import/git-p45
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index d3c3ad8..c144c89 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -1889,9 +1889,12 @@ class P4Sync(Command, P4UserMap):
# p4 has these %%1 to %%9 arguments in specs to
# reorder paths; which we can't handle (yet :)
- if re.match('%%\d', v) != None:
+ if re.search('%%\d', v) != None:
print "Sorry, can't handle %%n arguments in client specs"
sys.exit(1)
+ if re.search('\*', v) != None:
+ print "Sorry, can't handle * mappings in client specs"
+ sys.exit(1)
if v.startswith('"'):
start = 1