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>
This commit is contained in:
Krzysztof Mazur
2012-11-22 19:12:12 +01:00
committed by Junio C Hamano
parent 5c80afed02
commit d0e98107ba

View File

@ -851,10 +851,10 @@ sub extract_valid_address_or_die {
sub validate_address { sub validate_address {
my $address = shift; my $address = shift;
if (!extract_valid_address($address)) { while (!extract_valid_address($address)) {
print STDERR "error: unable to extract a valid address from: $address\n"; print STDERR "error: unable to extract a valid address from: $address\n";
$_ = ask("What to do with this address? ([q]uit|[d]rop): ", $_ = ask("What to do with this address? ([q]uit|[d]rop|[e]dit): ",
valid_re => qr/^(?:quit|q|drop|d)/i, valid_re => qr/^(?:quit|q|drop|d|edit|e)/i,
default => 'q'); default => 'q');
if (/^d/i) { if (/^d/i) {
return undef; return undef;
@ -862,6 +862,9 @@ sub validate_address {
cleanup_compose_files(); cleanup_compose_files();
exit(0); exit(0);
} }
$address = ask("Who should the email be sent to (if any)? ",
default => "",
valid_re => qr/\@.*\./, confirm_only => 1);
} }
return $address; return $address;
} }