Skip to content

Commit

Permalink
Merge branch 'tb/send-email-extract-valid-address-error-message-fix'
Browse files Browse the repository at this point in the history
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
  • Loading branch information
gitster committed Sep 23, 2023
2 parents 8ed1eee + 12288cc commit fa7a594
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions git-send-email.perl
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit fa7a594

Please sign in to comment.