Merge branch 'cn/cvsimport-perl-update'

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

diff --combined git-cvsimport.perl
index 82ecb0343a3864d1db0b066749d2087c11f689e7,8a687772483205c2b440edf5f5f3a1630604eed5..1e4e65a45d16cfcc5a36e6855216e9be8fe0e0b4
--- 1/git-cvsimport.perl
--- 2/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 {