diff options
| author | Krzysztof Mazur <krzysiek@podlesie.net> | 2012-11-22 19:12:11 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-26 15:49:12 -0800 |
| commit | 5c80afed02e1a5ffa4c164e8810aca8c8d655701 (patch) | |
| tree | 2bfe65f1fc7e1650e0dc8c4c687c4eeec18e1098 /git-send-email.perl | |
| parent | e43122556912b02ec00746c4b528d7408da9a70f (diff) | |
| download | git-5c80afed02e1a5ffa4c164e8810aca8c8d655701.tar.gz git-5c80afed02e1a5ffa4c164e8810aca8c8d655701.tar.xz | |
git-send-email: ask what to do with an invalid email address
We used to warn about invalid emails and just drop them. Such warnings
can be unnoticed by user or noticed after sending email when we are not
giving the "final sanity check [Y/n]?"
Now we quit by default.
Signed-off-by: Krzysztof Mazur <krzysiek@podlesie.net>
Suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-send-email.perl')
| -rwxr-xr-x | git-send-email.perl | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index 5a783ace0..11a6e8682 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -852,8 +852,16 @@ sub extract_valid_address_or_die { sub validate_address { my $address = shift; if (!extract_valid_address($address)) { - print STDERR "W: unable to extract a valid address from: $address\n"; - return undef; + 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, + default => 'q'); + if (/^d/i) { + return undef; + } elsif (/^q/i) { + cleanup_compose_files(); + exit(0); + } } return $address; } |