[PATCH] git-p4: fix keyword-expansion regex
- From
- Pete Wyckoff <pw@padd.com>
- Date
- Nov 26, 2008, 18:52 UTC
- Message-ID
- <20081126185215.GA11037@osc.edu>
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> --- contrib/fast-import/git-p4 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index 9b04ca5..09317af 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -1005,7 +1005,7 @@ class P4Sync(Command): 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
-- 1.5.6.5