diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-11-02 16:53:19 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-02 16:53:20 +0900 |
| commit | 584cde766b470317836b2160c2b4e3b659403ade (patch) | |
| tree | 65745b917c285fd220b9deaf9fed5cb182043224 | |
| parent | 2a6806140e13d5bb60a77cb398b483fadfb63ccb (diff) | |
| parent | 12288cc44e48810758b6d38b453b94568cb6fce3 (diff) | |
| download | git-584cde766b470317836b2160c2b4e3b659403ade.tar.gz | |
Merge branch 'tb/send-email-extract-valid-address-error-message-fix' into maint-2.42
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
| -rwxr-xr-x | git-send-email.perl | 6 |
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 { |