Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
send-email: fix grammo in the prompt that asks e-mail recipients
author
Junio C Hamano
<gitster@pobox.com>
Sun, 24 Apr 2016 19:31:44 +0000
(12:31 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 25 Apr 2016 20:35:38 +0000
(13:35 -0700)
The message, which dates back to the very original version
83b24437
made in 2005, sounds clumsy, grammatically incorrect, and is hard to
understand.
Reported-by: John Darrington <john@darrington.wattle.id.au>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-send-email.perl
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
7654286
)
diff --git
a/git-send-email.perl
b/git-send-email.perl
index e1e9b1460ced5f660b32796890df7336bc3d01af..9bccf7ac41ec32a9a6dbc4dba698e937a7eb09fd 100755
(executable)
--- a/
git-send-email.perl
+++ b/
git-send-email.perl
@@
-785,9
+785,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);
# 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 $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
default => "",
valid_re => qr/\@.*\./, confirm_only => 1);
push @initial_to, parse_address_line($to) if defined $to; # sanitized/validated later
@@
-885,7
+886,7
@@
sub validate_address {
cleanup_compose_files();
exit(0);
}
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);
}
default => "",
valid_re => qr/\@.*\./, confirm_only => 1);
}