Skip to content

Commit

Permalink
Merge branch 'jd/send-email-to-whom' into HEAD
Browse files Browse the repository at this point in the history
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
  • Loading branch information
gitster committed May 18, 2016
2 parents f12fffd + 0d6b21e commit 1f7b196
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions git-send-email.perl
Expand Up @@ -827,9 +827,10 @@ sub file_declares_8bit_cte {
# 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
Expand Down Expand Up @@ -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);
}
Expand Down

0 comments on commit 1f7b196

Please sign in to comment.