Merge branch 'cn/cvsimport-perl-update'

gitster · gitster · commit c82b6d3f4ba8 · 2015-06-25T11:08:08.000-07:00
* cn/cvsimport-perl-update:
  cvsimport: silence regex warning appearing in Perl 5.22.
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...
