Merge branch 'tb/send-email-extract-valid-address-error-message-fix' …

…into next An error message given by "git send-email" when given a malformed address did not give correct information, which has been corrected. * tb/send-email-extract-valid-address-error-message-fix: git-send-email.perl: avoid printing undef when validating addresses
mjg · Sep 19, 2023 · d037282 · d037282
2 parents 1e16b71 + 12288cc
commit d037282
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/git-send-email.perl b/git-send-email.perl
@@ -1166,10 +1166,10 @@ sub extract_valid_address {
 
 sub extract_valid_address_or_die {
 	my $address = shift;
-	$address = extract_valid_address($address);
+	my $valid_address = extract_valid_address($address);
 	die sprintf(__("error: unable to extract a valid address from: %s\n"), $address)
-		if !$address;
-	return $address;
+		if !$valid_address;
+	return $valid_address;
 }
 
 sub validate_address {