summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-25 18:08:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-25 18:08:08 (GMT)
commitc82b6d3f4ba871ef65e25f9c336eb7c46f92e367 (patch)
tree1e5287fbeed2397ceccc13dad6ad3ad5a6ecd106
parent5416f8af0f632d05371868bc4340327e1672c83c (diff)
parent16272c7db4cf647d86de89ee46b248013109529d (diff)
downloadgit-c82b6d3f4ba871ef65e25f9c336eb7c46f92e367.zip
git-c82b6d3f4ba871ef65e25f9c336eb7c46f92e367.tar.gz
git-c82b6d3f4ba871ef65e25f9c336eb7c46f92e367.tar.bz2
Merge branch 'cn/cvsimport-perl-update'
* cn/cvsimport-perl-update: cvsimport: silence regex warning appearing in Perl 5.22.
-rwxr-xr-xgit-cvsimport.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 82ecb03..1e4e65a 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...