Browse Source

Merge branch 'cn/cvsimport-perl-update'

* cn/cvsimport-perl-update:
  cvsimport: silence regex warning appearing in Perl 5.22.
maint
Junio C Hamano 10 years ago
parent
commit
c82b6d3f4b
  1. 2
      git-cvsimport.perl

2
git-cvsimport.perl

@ -921,7 +921,7 @@ sub commit {
# (See check_refname_component in refs.c.) # (See check_refname_component in refs.c.)
1 while $xtag =~ s/ 1 while $xtag =~ s/
(?: \.\. # Tag cannot contain '..'. (?: \.\. # Tag cannot contain '..'.
| \@{ # Tag cannot contain '@{'. | \@\{ # Tag cannot contain '@{'.
| ^ - # Tag cannot begin with '-'. | ^ - # Tag cannot begin with '-'.
| \.lock $ # Tag cannot end with '.lock'. | \.lock $ # Tag cannot end with '.lock'.
| ^ \. # Tag cannot begin... | ^ \. # Tag cannot begin...

Loading…
Cancel
Save