send-email: only allow one address per body tag

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 344f1206d111a57ec529c34785ff8b1a6537e4d1..1e4e65a45d16cfcc5a36e6855216e9be8fe0e0b4 100755 (executable)
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -38,7 +38,7 @@ (;$)
        my $msg = shift;
        print(STDERR "Error: $msg\n") if $msg;
        print STDERR <<END;
-Usage: git cvsimport     # fetch/update GIT from CVS
+usage: git cvsimport     # fetch/update GIT from CVS
        [-o branch-for-HEAD] [-h] [-v] [-d CVSROOT] [-A author-conv-file]
        [-p opts-for-cvsps] [-P file] [-C GIT_repository] [-z fuzz] [-i] [-k]
        [-u] [-s subst] [-a] [-m] [-M regex] [-S regex] [-L commitlimit]
@@ -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 @@ sub commit {
                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 {