summary refs log tree commit diff
path: root/git-cvsimport.perl
diff options
context:
space:
mode:
authorChristian Neukirchen <chneukirchen@gmail.com>2015-06-24 16:04:20 +0200
committerJunio C Hamano <gitster@pobox.com>2015-06-24 17:14:27 -0700
commit16272c7db4cf647d86de89ee46b248013109529d (patch)
tree8745a18ffa5469f9420383addfa93e79ebae4732 /git-cvsimport.perl
parent282616c72d1d08a77ca4fe1186cb708c38408d87 (diff)
cvsimport: silence regex warning appearing in Perl 5.22.
Since Perl 5.22, "A literal '{' should now be escaped in a pattern".
Silence the recently added warning by using \{ instead.

Signed-off-by: Christian Neukirchen <chneukirchen@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-cvsimport.perl')
-rwxr-xr-xgit-cvsimport.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 73d367cea8..8a68777248 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...