docs/git-tag: explain lightweight versus annotated tags

diff --git a/git-p4.py b/git-p4.py
index 882b1bbab53c6e184c7eadb5250c128b59c93482..7d6c928c3f2b3d90a754f855c074ea57d2ca1bbf 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