git-send-email: allow edit invalid email address
In some cases the user may want to send email with "Cc:" line with email address we cannot extract. Now we allow user to extract such email address for us. Signed-off-by: Krzysztof Mazur <krzysiek@podlesie.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Krzysztof Mazur committed
Nov 22, 2012 at 19:12 UTC
d0e98107bac36af7526fdb5c080ce9dfb56161ce
1 file changed
+6
-3
git-send-email.perl
+6
-3
@@ -851,10 +851,10 @@ sub extract_valid_address_or_die {
851
852
sub validate_address {
853
my $address = shift;
854
- if (!extract_valid_address($address)) {
854
+ while (!extract_valid_address($address)) {
855
print STDERR "error: unable to extract a valid address from: $address\n";
856
- $_ = ask("What to do with this address? ([q]uit|[d]rop): ",
857
- valid_re => qr/^(?:quit|q|drop|d)/i,
856
+ $_ = ask("What to do with this address? ([q]uit|[d]rop|[e]dit): ",
857
+ valid_re => qr/^(?:quit|q|drop|d|edit|e)/i,
858
default => 'q');
859
if (/^d/i) {
860
return undef;
@@ -862,6 +862,9 @@ sub validate_address {
862
cleanup_compose_files();
863
exit(0);
864
}
865
+ $address = ask("Who should the email be sent to (if any)? ",
866
+ default => "",
867
+ valid_re => qr/\@.*\./, confirm_only => 1);
868
}
869
return $address;
870
}