git p4: RCS expansion should not span newlines

diff --git a/git-p4.py b/git-p4.py
index e67d37d2f93361337df6e680d2b2ab961e31ad66..8dbcdc3b8b38c97ae64d17e73dda4c1de2df1660 100755 (executable)
--- a/git-p4.py
+++ b/git-p4.py
@@ -227,7 +227,7 @@ def p4_keywords_regexp_for_type(base, type_mods):
         pattern = r"""
             \$              # Starts with a dollar, followed by...
             (%s)            # one of the keywords, followed by...
-            (:[^$]+)?       # possibly an old expansion, followed by...
+            (:[^$\n]+)?     # possibly an old expansion, followed by...
             \$              # another dollar
             """ % kwords
         return pattern