Pete Wyckoff  committed 3d51c85

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

Signed-off-by: Pete Wyckoff <>
Acked-by: Simon Hausmann <>
Signed-off-by: Junio C Hamano <>

  • Participants
  • Parent commits 5aa3bdd
  • Branches master

Comments (0)

Files changed (1)

File contrib/fast-import/git-p4

             if stat['type'] in ('text+ko', 'unicode+ko', 'binary+ko'):
                 text = re.sub(r'(?i)\$(Id|Header):[^$]*\$',r'$\1$', text)
             elif stat['type'] in ('text+k', 'ktext', 'kxtext', 'unicode+k', 'binary+k'):
-                text = re.sub(r'\$(Id|Header|Author|Date|DateTime|Change|File|Revision):[^$]*\$',r'$\1$', text)
+                text = re.sub(r'\$(Id|Header|Author|Date|DateTime|Change|File|Revision):[^$\n]*\$',r'$\1$', text)
             contents[stat['depotFile']] = text