aboutsummaryrefslogtreecommitdiffstats
path: root/git-send-email.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-09-22 17:01:37 -0700
committerJunio C Hamano <gitster@pobox.com>2023-09-22 17:01:37 -0700
commitfa7a594daca938802bcd226713539e6a7f403095 (patch)
tree14584a7c7edeef22ad88ddee23c9b74775c673d3 /git-send-email.perl
parentMerge branch 'ch/clean-docfix' (diff)
parentgit-send-email.perl: avoid printing undef when validating addresses (diff)
downloadgit-fa7a594daca938802bcd226713539e6a7f403095.tar.gz
git-fa7a594daca938802bcd226713539e6a7f403095.zip
Merge branch 'tb/send-email-extract-valid-address-error-message-fix'
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
Diffstat (limited to 'git-send-email.perl')
-rwxr-xr-xgit-send-email.perl6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-send-email.perl b/git-send-email.perl
index 897cea6564..288ea1ae80 100755
--- 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 {