Change the scope of the $cc variable as it is not needed outside of send_message.

$cc is only used inside the send_message scope, so lets clean it out of the global scope.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-send-email.perl b/git-send-email.perl
index 36795c8bddc597e44f6e2193eab38359725a83d6..ad83009e236c4b8be2fa0b4204ed340c0e205de5 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -379,7 +379,7 @@ sub expand_aliases {
 }
 
 # Variables we set as part of the loop over files
 }
 
 # Variables we set as part of the loop over files

-our ($message_id, $cc, %mail, $subject, $reply_to, $references, $message);
+our ($message_id, %mail, $subject, $reply_to, $references, $message);

 
 sub extract_valid_address {
        my $address = shift;
 
 sub extract_valid_address {
        my $address = shift;


@@ -420,7 +420,6 @@ sub make_message_id
 
 
 
 
 
 

-$cc = "";

 $time = time - scalar $#files;
 
 sub unquote_rfc2047 {
 $time = time - scalar $#files;
 
 sub unquote_rfc2047 {


@@ -443,7 +442,8 @@ sub send_message
            $gitversion = Git::version();
        }
 
            $gitversion = Git::version();
        }
 

-       my ($author_name) = ($from =~ /^(.*?)\s+</);
+       my $cc = join(", ", unique_email_list(@cc));
+my ($author_name) = ($from =~ /^(.*?)\s+</);

        if ($author_name && $author_name =~ /\./ && $author_name !~ /^".*"$/) {
                my ($name, $addr) = ($from =~ /^(.*?)(\s+<.*)/);
                $from = "\"$name\"$addr";
        if ($author_name && $author_name =~ /\./ && $author_name !~ /^".*"$/) {
                my ($name, $addr) = ($from =~ /^(.*?)(\s+<.*)/);
                $from = "\"$name\"$addr";


@@ -591,7 +591,6 @@ sub send_message
                $message = "From: $author_not_sender\n\n$message";
        }
 
                $message = "From: $author_not_sender\n\n$message";
        }
 

-       $cc = join(", ", unique_email_list(@cc));

 
        send_message();
 
 
        send_message();