mirror of
https://github.com/git/git.git
synced 2024-10-28 12:59:41 +01:00
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>
This commit is contained in:
parent
edca415256
commit
b99d22f29a
2 changed files with 2 additions and 66 deletions
|
@ -203,11 +203,9 @@ sub do_edit {
|
|||
|
||||
my ($debug_net_smtp) = 0; # Net::SMTP, see send_message()
|
||||
|
||||
my $not_set_by_user = "true but not set by the user";
|
||||
|
||||
my %config_bool_settings = (
|
||||
"thread" => [\$thread, 1],
|
||||
"chainreplyto" => [\$chain_reply_to, $not_set_by_user],
|
||||
"chainreplyto" => [\$chain_reply_to, 0],
|
||||
"suppressfrom" => [\$suppress_from, undef],
|
||||
"signedoffbycc" => [\$signed_off_by_cc, undef],
|
||||
"signedoffcc" => [\$signed_off_by_cc, undef], # Deprecated
|
||||
|
@ -241,19 +239,6 @@ sub do_edit {
|
|||
"aliasesfile" => \@alias_files,
|
||||
);
|
||||
|
||||
# Help users prepare for 1.7.0
|
||||
sub chain_reply_to {
|
||||
if (defined $chain_reply_to &&
|
||||
$chain_reply_to eq $not_set_by_user) {
|
||||
print STDERR
|
||||
"In git 1.7.0, the default has changed to --no-chain-reply-to\n" .
|
||||
"Set sendemail.chainreplyto configuration variable to true if\n" .
|
||||
"you want to keep --chain-reply-to as your default.\n";
|
||||
$chain_reply_to = 0;
|
||||
}
|
||||
return $chain_reply_to;
|
||||
}
|
||||
|
||||
# Handle Uncouth Termination
|
||||
sub signal_handler {
|
||||
|
||||
|
@ -1437,7 +1422,7 @@ sub send_message {
|
|||
|
||||
# set up for the next message
|
||||
if ($thread && $message_was_sent &&
|
||||
(chain_reply_to() || !defined $reply_to || length($reply_to) == 0 ||
|
||||
($chain_reply_to || !defined $reply_to || length($reply_to) == 0 ||
|
||||
$message_num == 1)) {
|
||||
$reply_to = $message_id;
|
||||
if (length $references > 0) {
|
||||
|
|
|
@ -1003,55 +1003,6 @@ test_expect_success $PREREQ 'threading but no chain-reply-to' '
|
|||
grep "In-Reply-To: " stdout
|
||||
'
|
||||
|
||||
test_expect_success $PREREQ 'warning with an implicit --chain-reply-to' '
|
||||
git send-email \
|
||||
--dry-run \
|
||||
--from="Example <nobody@example.com>" \
|
||||
--to=nobody@example.com \
|
||||
outdir/000?-*.patch 2>errors >out &&
|
||||
grep "no-chain-reply-to" errors
|
||||
'
|
||||
|
||||
test_expect_success $PREREQ 'no warning with an explicit --chain-reply-to' '
|
||||
git send-email \
|
||||
--dry-run \
|
||||
--from="Example <nobody@example.com>" \
|
||||
--to=nobody@example.com \
|
||||
--chain-reply-to \
|
||||
outdir/000?-*.patch 2>errors >out &&
|
||||
! grep "no-chain-reply-to" errors
|
||||
'
|
||||
|
||||
test_expect_success $PREREQ 'no warning with an explicit --no-chain-reply-to' '
|
||||
git send-email \
|
||||
--dry-run \
|
||||
--from="Example <nobody@example.com>" \
|
||||
--to=nobody@example.com \
|
||||
--nochain-reply-to \
|
||||
outdir/000?-*.patch 2>errors >out &&
|
||||
! grep "no-chain-reply-to" errors
|
||||
'
|
||||
|
||||
test_expect_success $PREREQ 'no warning with sendemail.chainreplyto = false' '
|
||||
git config sendemail.chainreplyto false &&
|
||||
git send-email \
|
||||
--dry-run \
|
||||
--from="Example <nobody@example.com>" \
|
||||
--to=nobody@example.com \
|
||||
outdir/000?-*.patch 2>errors >out &&
|
||||
! grep "no-chain-reply-to" errors
|
||||
'
|
||||
|
||||
test_expect_success $PREREQ 'no warning with sendemail.chainreplyto = true' '
|
||||
git config sendemail.chainreplyto true &&
|
||||
git send-email \
|
||||
--dry-run \
|
||||
--from="Example <nobody@example.com>" \
|
||||
--to=nobody@example.com \
|
||||
outdir/000?-*.patch 2>errors >out &&
|
||||
! grep "no-chain-reply-to" errors
|
||||
'
|
||||
|
||||
test_expect_success $PREREQ 'sendemail.to works' '
|
||||
git config --replace-all sendemail.to "Somebody <somebody@ex.com>" &&
|
||||
git send-email \
|
||||
|
|
Loading…
Reference in a new issue