diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-05-18 14:40:07 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-05-18 14:40:07 -0700 |
commit | 1f7b196e2181c4d23959193327941ee4e065748c (patch) | |
tree | f8ec4920bbfb3e9903096b9556ab611ab990a2c7 | |
parent | Merge branch 'js/win32-mmap' into HEAD (diff) | |
parent | send-email: fix grammo in the prompt that asks e-mail recipients (diff) | |
download | tgif-1f7b196e2181c4d23959193327941ee4e065748c.tar.xz |
Merge branch 'jd/send-email-to-whom' into HEAD
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
-rwxr-xr-x | git-send-email.perl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index 1406f64d78..69587856df 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -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); } |