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>

diff --git a/git-send-email.perl b/git-send-email.perl
index 11a6e868236cc7bd7b1b9db371fa662242b789a7..f3bbc166d6fff82add7e61d0d4cb9d68a2007e34 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -851,10 +851,10 @@ sub extract_valid_address_or_die {
 
 sub validate_address {
        my $address = shift;
 
 sub validate_address {
        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): ",
-                       valid_re => qr/^(?:quit|q|drop|d)/i,
+               $_ = ask("What to do with this address? ([q]uit|[d]rop|[e]dit): ",
+                       valid_re => qr/^(?:quit|q|drop|d|edit|e)/i,

                        default => 'q');
                if (/^d/i) {
                        return undef;
                        default => 'q');
                if (/^d/i) {
                        return undef;


@@ -862,6 +862,9 @@ sub validate_address {
                        cleanup_compose_files();
                        exit(0);
                }
                        cleanup_compose_files();
                        exit(0);
                }

+               $address = ask("Who should the email be sent to (if any)? ",
+                       default => "",
+                       valid_re => qr/\@.*\./, confirm_only => 1);

        }
        return $address;
 }
        }
        return $address;
 }