From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Jun 2015 18:08:08 +0000 (-0700)
Subject: Merge branch 'cn/cvsimport-perl-update'
X-Git-Tag: v2.5.0-rc0~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c82b6d3f4ba871ef65e25f9c336eb7c46f92e367?ds=inline;hp=-c

Merge branch 'cn/cvsimport-perl-update'

* cn/cvsimport-perl-update:
cvsimport: silence regex warning appearing in Perl 5.22.
---

c82b6d3f4ba871ef65e25f9c336eb7c46f92e367
diff --combined git-cvsimport.perl
index 82ecb0343a,8a68777248..1e4e65a45d
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@@ -921,7 -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...
@@@ -1162,7 -1162,7 +1162,7 @@@ if ($orig_branch) 
  		die "Fast-forward update failed: $?\n" if $?;
  	}
  	else {
 -		system(qw(git merge cvsimport HEAD), "$remote/$opt_o");
 +		system(qw(git merge -m cvsimport), "$remote/$opt_o");
  		die "Could not merge $opt_o into the current branch.\n" if $?;
  	}
  } else {