From 6b2bf41e6c1c9742c5ad5b5920f48a7b23aa6a50 Mon Sep 17 00:00:00 2001 From: Pete Wyckoff Date: Sun, 4 Nov 2012 17:04:02 -0500 Subject: 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 Signed-off-by: Pete Wyckoff Signed-off-by: Jeff King --- git-p4.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git-p4.py') 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 -- cgit v1.2.1