summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-11-20 10:34:15 -0800
committerJunio C Hamano <gitster@pobox.com>2012-11-20 10:34:15 -0800
commit077ad4a0f20a4b7288ba001a5bb33742ff56e9fa (patch)
treee2878de910572564f9a7fa966a2bb2fdd6c7aa4c /git-p4.py
parentb0c07c8dc4798f1d6cc7bb515ab36f1ae0c58678 (diff)
parent6b2bf41e6c1c9742c5ad5b5920f48a7b23aa6a50 (diff)
downloadgit-077ad4a0f20a4b7288ba001a5bb33742ff56e9fa.tar.gz
Merge branch 'pw/maint-p4-rcs-expansion-newline'
I do not have p4 to play with, but looks obviously correct to me. * pw/maint-p4-rcs-expansion-newline: git p4: RCS expansion should not span newlines
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 882b1bbab5..7d6c928c3f 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