Merge branch 'cn/cvsimport-perl-update'

* cn/cvsimport-perl-update: cvsimport: silence regex warning appearing in Perl 5.22.
git-mirror · Jun 25, 2015 · c82b6d3 · c82b6d3
2 parents 5416f8a + 16272c7
commit c82b6d3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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...