From: Robin H. Johnson <robbat2@gentoo.org>
Date: Thu, 26 Apr 2007 02:37:18 +0000 (-0700)
Subject: Change the scope of the $cc variable as it is not needed outside of send_message.
X-Git-Tag: v1.5.1.3~31
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=af068d274245be9aedc58e6835c2e43329639974;p=git-core%2Fgit.git

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 36795c8bd..ad83009e2 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -379,7 +379,7 @@ if (@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;
@@ -420,7 +420,6 @@ sub make_message_id
 
 
 
-$cc = "";
 $time = time - scalar $#files;
 
 sub unquote_rfc2047 {
@@ -443,7 +442,8 @@ sub send_message
 	    $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";
@@ -591,7 +591,6 @@ foreach my $t (@files) {
 		$message = "From: $author_not_sender\n\n$message";
 	}
 
-	$cc = join(", ", unique_email_list(@cc));
 
 	send_message();