git-p4: fix keyword-expansion regex
This text: my $dir = $File::Find::dir; return if ($dir !~ m,$options->{dirpat}$,); was improperly converted to: my $dir = $File$dir !~ m,$options->{dirpat}$,); by the keyword identifier expansion code. Add a \n to make sure the regex doesn't go across end-of-line boundaries. Signed-off-by: Pete Wyckoff <pw@padd.com> Acked-by: Simon Hausmann <simon@lst.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Pete Wyckoff committed
Nov 26, 2008 at 13:52 UTC
3d51c853df5730212f704a526340a5a059dffeda
1 file changed
+1
-1
contrib/fast-import/git-p4
+1
-1
@@ -963,7 +963,7 @@ class P4Sync(Command):
963
if stat['type'] in ('text+ko', 'unicode+ko', 'binary+ko'):
964
text = re.sub(r'(?i)\$(Id|Header):[^$]*\$',r'$\1$', text)
965
elif stat['type'] in ('text+k', 'ktext', 'kxtext', 'unicode+k', 'binary+k'):
966
- text = re.sub(r'\$(Id|Header|Author|Date|DateTime|Change|File|Revision):[^$]*\$',r'$\1$', text)
966
+ text = re.sub(r'\$(Id|Header|Author|Date|DateTime|Change|File|Revision):[^$\n]*\$',r'$\1$', text)
967
968
contents[stat['depotFile']] = text
969