diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-25 21:08:08 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-25 21:08:08 +0300 |
| commit | c82b6d3f4ba871ef65e25f9c336eb7c46f92e367 (patch) | |
| tree | 1e5287fbeed2397ceccc13dad6ad3ad5a6ecd106 /git-cvsimport.perl | |
| parent | 5416f8af0f632d05371868bc4340327e1672c83c (diff) | |
| parent | 16272c7db4cf647d86de89ee46b248013109529d (diff) | |
Merge branch 'cn/cvsimport-perl-update'
* cn/cvsimport-perl-update:
cvsimport: silence regex warning appearing in Perl 5.22.
Diffstat (limited to 'git-cvsimport.perl')
| -rwxr-xr-x | git-cvsimport.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsimport.perl b/git-cvsimport.perl index 82ecb0343a..1e4e65a45d 100755 --- a/git-cvsimport.perl +++ b/git-cvsimport.perl @@ -921,7 +921,7 @@ sub commit { # (See check_refname_component in refs.c.) 1 while $xtag =~ s/ (?: \.\. # Tag cannot contain '..'. - | \@{ # Tag cannot contain '@{'. + | \@\{ # Tag cannot contain '@{'. | ^ - # Tag cannot begin with '-'. | \.lock $ # Tag cannot end with '.lock'. | ^ \. # Tag cannot begin... |