Merge branch 'jd/send-email-to-whom'

A question by "git send-email" to ask the identity of the sender
has been updated.

* jd/send-email-to-whom:
  send-email: fix grammo in the prompt that asks e-mail recipients
This commit is contained in:
Junio C Hamano 2016-05-03 14:08:16 -07:00
Родитель b342567b2e 0d6b21e781
Коммит 9b782d297c
1 изменённых файлов: 3 добавлений и 2 удалений

Просмотреть файл

@ -827,9 +827,10 @@ if (defined $sender) {
# But it's a no-op to run sanitize_address on an already sanitized address.
$sender = sanitize_address($sender);
my $to_whom = "To whom should the emails be sent (if anyone)?";
my $prompting = 0;
if (!@initial_to && !defined $to_cmd) {
my $to = ask("Who should the emails be sent to (if any)? ",
my $to = ask("$to_whom ",
default => "",
valid_re => qr/\@.*\./, confirm_only => 1);
push @initial_to, parse_address_line($to) if defined $to; # sanitized/validated later
@ -924,7 +925,7 @@ sub validate_address {
cleanup_compose_files();
exit(0);
}
$address = ask("Who should the email be sent to (if any)? ",
$address = ask("$to_whom ",
default => "",
valid_re => qr/\@.*\./, confirm_only => 1);
}