projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7e20105) | patch
git p4: RCS expansion should not span newlines
authorPete Wyckoff <pw@padd.com>
Sun, 4 Nov 2012 22:04:02 +0000 (17:04 -0500)
committerJeff King <peff@peff.net>
Thu, 8 Nov 2012 17:46:14 +0000 (12:46 -0500)
commit6b2bf41e6c1c9742c5ad5b5920f48a7b23aa6a50
treeaac1a6d862433fb4f4a1a7e93d4ec8eb842e71eetree | snapshot
parent7e2010537e96d0a1144520222f20ba1dc3d61441commit | diff
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>
git-p4.py diff | blob | history
t/t9810-git-p4-rcs.sh diff | blob | history
Git—the stupid content tracker