mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-12-13 03:44:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fc/send-email-chainreplyto-warning'

Browse Source 
An overdue removal of "behaviour changed at 1.7.0; if you were
living in a cave, here is what you can adjust to it" message.

* fc/send-email-chainreplyto-warning:
  send-email: remove warning about unset chainreplyto
This commit is contained in:
Junio C Hamano 2013-06-05 14:59:34 -07:00
commit 54b9b58a8c
2 changed files with 2 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
git-send-email.perl
View File

@ -203,11 +203,9 @@ my ($compose_encoding);
my ($debug_net_smtp) = 0; # Net::SMTP, see send_message() 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 = ( my %config_bool_settings = (
"thread" => [\$thread, 1], "thread" => [\$thread, 1],
"chainreplyto" => [\$chain_reply_to, $not_set_by_user], "chainreplyto" => [\$chain_reply_to, 0],
"suppressfrom" => [\$suppress_from, undef], "suppressfrom" => [\$suppress_from, undef],
"signedoffbycc" => [\$signed_off_by_cc, undef], "signedoffbycc" => [\$signed_off_by_cc, undef],
"signedoffcc" => [\$signed_off_by_cc, undef], # Deprecated "signedoffcc" => [\$signed_off_by_cc, undef], # Deprecated
@ -241,19 +239,6 @@ my %config_path_settings = (
"aliasesfile" => \@alias_files, "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 # Handle Uncouth Termination
sub signal_handler { sub signal_handler {
@ -1437,7 +1422,7 @@ foreach my $t (@files) {
# set up for the next message # set up for the next message
if ($thread && $message_was_sent && 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)) { $message_num == 1)) {
$reply_to = $message_id; $reply_to = $message_id;
if (length $references > 0) { if (length $references > 0) {

49
t/t9001-send-email.sh
View File

@ -1003,55 +1003,6 @@ test_expect_success $PREREQ 'threading but no chain-reply-to' '
grep "In-Reply-To: " stdout 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' ' test_expect_success $PREREQ 'sendemail.to works' '
git config --replace-all sendemail.to "Somebody <somebody@ex.com>" && git config --replace-all sendemail.to "Somebody <somebody@ex.com>" &&
git send-email \ git send-email \