send-email: remove warning about unset chainreplyto
Three years and a half is probably more than enough time to give users the opportunity to configure Git to do what they want. If they haven't changed the configuration by now, this warning message is not going to do anything for them anyway. This effectively reverts commit 528fb08 (prepare send-email for smoother change of --chain-reply-to default). Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
May 24, 2013 at 22:44 UTC
b99d22f29a58feeccb1eb129b68a73f974715ee1
2 files changed
+2
-66
git-send-email.perl
+2
-17
@@ -203,11 +203,9 @@ my ($compose_encoding);
203
204
my ($debug_net_smtp) = 0; # Net::SMTP, see send_message()
205
206
-my $not_set_by_user = "true but not set by the user";
207
-
206
my %config_bool_settings = (
207
"thread" => [\$thread, 1],
210
- "chainreplyto" => [\$chain_reply_to, $not_set_by_user],
208
+ "chainreplyto" => [\$chain_reply_to, 0],
209
"suppressfrom" => [\$suppress_from, undef],
210
"signedoffbycc" => [\$signed_off_by_cc, undef],
211
"signedoffcc" => [\$signed_off_by_cc, undef], # Deprecated
@@ -241,19 +239,6 @@ my %config_path_settings = (
239
"aliasesfile" => \@alias_files,
240
);
241
244
-# Help users prepare for 1.7.0
245
-sub chain_reply_to {
246
- if (defined $chain_reply_to &&
247
- $chain_reply_to eq $not_set_by_user) {
248
- print STDERR
249
- "In git 1.7.0, the default has changed to --no-chain-reply-to\n" .
250
- "Set sendemail.chainreplyto configuration variable to true if\n" .
251
- "you want to keep --chain-reply-to as your default.\n";
252
- $chain_reply_to = 0;
253
- }
254
- return $chain_reply_to;
255
-}
256
-
242
# Handle Uncouth Termination
243
sub signal_handler {
244
@@ -1437,7 +1422,7 @@ foreach my $t (@files) {
1422
1423
# set up for the next message
1424
if ($thread && $message_was_sent &&
1440
- (chain_reply_to() || !defined $reply_to || length($reply_to) == 0 ||
1425
+ ($chain_reply_to || !defined $reply_to || length($reply_to) == 0 ||
1426
$message_num == 1)) {
1427
$reply_to = $message_id;
1428
if (length $references > 0) {
t/t9001-send-email.sh
-49
@@ -1003,55 +1003,6 @@ test_expect_success $PREREQ 'threading but no chain-reply-to' '
1003
grep "In-Reply-To: " stdout
1004
'
1005
1006
-test_expect_success $PREREQ 'warning with an implicit --chain-reply-to' '
1007
- git send-email \
1008
- --dry-run \
1009
- --from="Example <nobody@example.com>" \
1010
- --to=nobody@example.com \
1011
- outdir/000?-*.patch 2>errors >out &&
1012
- grep "no-chain-reply-to" errors
1013
-'
1014
-
1015
-test_expect_success $PREREQ 'no warning with an explicit --chain-reply-to' '
1016
- git send-email \
1017
- --dry-run \
1018
- --from="Example <nobody@example.com>" \
1019
- --to=nobody@example.com \
1020
- --chain-reply-to \
1021
- outdir/000?-*.patch 2>errors >out &&
1022
- ! grep "no-chain-reply-to" errors
1023
-'
1024
-
1025
-test_expect_success $PREREQ 'no warning with an explicit --no-chain-reply-to' '
1026
- git send-email \
1027
- --dry-run \
1028
- --from="Example <nobody@example.com>" \
1029
- --to=nobody@example.com \
1030
- --nochain-reply-to \
1031
- outdir/000?-*.patch 2>errors >out &&
1032
- ! grep "no-chain-reply-to" errors
1033
-'
1034
-
1035
-test_expect_success $PREREQ 'no warning with sendemail.chainreplyto = false' '
1036
- git config sendemail.chainreplyto false &&
1037
- git send-email \
1038
- --dry-run \
1039
- --from="Example <nobody@example.com>" \
1040
- --to=nobody@example.com \
1041
- outdir/000?-*.patch 2>errors >out &&
1042
- ! grep "no-chain-reply-to" errors
1043
-'
1044
-
1045
-test_expect_success $PREREQ 'no warning with sendemail.chainreplyto = true' '
1046
- git config sendemail.chainreplyto true &&
1047
- git send-email \
1048
- --dry-run \
1049
- --from="Example <nobody@example.com>" \
1050
- --to=nobody@example.com \
1051
- outdir/000?-*.patch 2>errors >out &&
1052
- ! grep "no-chain-reply-to" errors
1053
-'
1054
-
1006
test_expect_success $PREREQ 'sendemail.to works' '
1007
git config --replace-all sendemail.to "Somebody <somebody@ex.com>" &&
1008
git send-email \