diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-11-28 12:04:32 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-11-28 12:04:50 -0800 |
commit | 2a7f6ffb9168c2e0d1f4ca9c1b63357e431093e9 (patch) | |
tree | 6f857fe670e7c1c6cfd434233e884ab15cb1d9da /git-p4.py | |
parent | completion: add options --single-branch and --branch to "git clone" (diff) | |
parent | git p4: RCS expansion should not span newlines (diff) | |
download | tgif-2a7f6ffb9168c2e0d1f4ca9c1b63357e431093e9.tar.xz |
Merge branch 'pw/maint-p4-rcs-expansion-newline' into maint
"git p4" used to try expanding malformed "$keyword$" that spans
across multiple lines.
* pw/maint-p4-rcs-expansion-newline:
git p4: RCS expansion should not span newlines
Diffstat (limited to 'git-p4.py')
-rwxr-xr-x | git-p4.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |