git-send-email: fix fallback code in extract_valid_address()

diff --git a/git-send-email.perl b/git-send-email.perl
index 9840d0afcaf02915d8a6d179bb296bd5e4ba86f1..356f99d430c80a862759b4543e0edc7d2b759638 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -831,12 +831,12 @@ sub extract_valid_address {
        $address =~ s/^\s*<(.*)>\s*$/$1/;
        if ($have_email_valid) {
                return scalar Email::Valid->address($address);
-       } else {
-               # less robust/correct than the monster regexp in Email::Valid,
-               # but still does a 99% job, and one less dependency
-               $address =~ /($local_part_regexp\@$domain_regexp)/;
-               return $1;
        }
+
+       # less robust/correct than the monster regexp in Email::Valid,
+       # but still does a 99% job, and one less dependency
+       return $1 if $address =~ /($local_part_regexp\@$domain_regexp)/;
+       return undef;
 }
 
 # Usually don't need to change anything below here.