git-send-email: die if sendmail.* config is set
I've seen several people mis-configure git send-email on their first attempt because they set the sendmail.* config options - not sendemail.*. This patch detects this mistake and bails out with a friendly warning. Signed-off-by: Drew DeVault <sir@cmpwn.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
3d20111cbd
commit
dd84e528a3
@ -250,6 +250,7 @@ my $chain_reply_to = 0;
|
||||
my $use_xmailer = 1;
|
||||
my $validate = 1;
|
||||
my $target_xfer_encoding = 'auto';
|
||||
my $forbid_sendmail_variables = 1;
|
||||
|
||||
my %config_bool_settings = (
|
||||
"thread" => \$thread,
|
||||
@ -263,6 +264,7 @@ my %config_bool_settings = (
|
||||
"multiedit" => \$multiedit,
|
||||
"annotate" => \$annotate,
|
||||
"xmailer" => \$use_xmailer,
|
||||
"forbidsendmailvariables" => \$forbid_sendmail_variables,
|
||||
);
|
||||
|
||||
my %config_settings = (
|
||||
@ -478,6 +480,12 @@ unless ($rc) {
|
||||
usage();
|
||||
}
|
||||
|
||||
if ($forbid_sendmail_variables && (scalar Git::config_regexp("^sendmail[.]")) != 0) {
|
||||
die __("fatal: found configuration options for 'sendmail'\n" .
|
||||
"git-send-email is configured with the sendemail.* options - note the 'e'.\n" .
|
||||
"Set sendemail.forbidSendmailVariables to false to disable this check.\n");
|
||||
}
|
||||
|
||||
die __("Cannot run git format-patch from outside a repository\n")
|
||||
if $format_patch and not $repo;
|
||||
|
||||
|
Reference in New Issue
Block a user