summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorPete Wyckoff <pw@padd.com>2012-11-04 17:04:02 -0500
committerJeff King <peff@peff.net>2012-11-08 12:46:14 -0500
commit6b2bf41e6c1c9742c5ad5b5920f48a7b23aa6a50 (patch)
treeaac1a6d862433fb4f4a1a7e93d4ec8eb842e71ee /git-p4.py
parent7e2010537e96d0a1144520222f20ba1dc3d61441 (diff)
downloadgit-6b2bf41e6c1c9742c5ad5b5920f48a7b23aa6a50.tar.gz
git p4: RCS expansion should not span newlines
This bug was introduced in cb585a9 (git-p4: keyword flattening fixes, 2011-10-16). The newline character is indeed special, and $File$ expansions should not try to match across multiple lines. Based-on-patch-by: Chris Goard <cgoard@gmail.com> Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 'git-p4.py')
-rwxr-xr-xgit-p4.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-p4.py b/git-p4.py
index e67d37d2f9..8dbcdc3b8b 100755
--- 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