Fix a bug in email extraction used in git-send-email.

(Also, kill off an accidentally created warning.)

Signed-off-by: Ryan Anderson <rda@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

1 files changed, 6 insertions, 1 deletions

diff --git a/git-send-email.perl b/git-send-email.perl
index 85ec5df13a..d418d6c5d2 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -322,7 +322,11 @@ sub extract_valid_address {
 	} else {
 		# less robust/correct than the monster regexp in Email::Valid,
 		# but still does a 99% job, and one less dependency
-		return ($address =~ /([^\"<>\s]+@[^<>\s]+)/);
+		my $cleaned_address;
+		if ($address =~ /([^\"<>\s]+@[^<>\s]+)/) {
+			$cleaned_address = $1;
+		}
+		return $cleaned_address;
 	}
 }
 
@@ -416,6 +420,7 @@ X-Mailer: git-send-email $gitversion
 }
 
 $reply_to = $initial_reply_to;
+$references = $initial_reply_to;
 make_message_id();
 $subject = $initial_subject;