From dbf5e1e974ff6264b04759a4a3e04966b056e533 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Tue, 30 Sep 2008 07:58:27 -0500 Subject: [PATCH] send-email: change --no-validate to boolean --[no-]validate There is also now a configuration variable: sendemail[.].validate Signed-off-by: Michael Witten Acked-by: Jeff King Signed-off-by: Shawn O. Pearce --- Documentation/git-send-email.txt | 9 +++++++-- git-send-email.perl | 9 +++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index 0c6dbf6d53..81970f3fa4 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -182,14 +182,16 @@ configuration variable), then authentication is not attempted. + The --to option must be repeated for each user you want on the to list. ---no-validate:: - Don't perform any sanity checks on patches. +--[no-]validate:: + Perform sanity checks on patches. Currently, validation means the following: + -- * Warn of patches that contain lines longer than 998 characters; this is due to SMTP limits as described by http://www.ietf.org/rfc/rfc2821.txt. -- ++ +This option can be set with sendemail[.].validate; default to --validate CONFIGURATION @@ -242,6 +244,9 @@ sendemail.smtpencryption:: sendemail.smtpssl:: Legacy boolean that sets 'smtpencryption=ssl' if enabled. +sendemail.validate:: + Boolean override for --[no-]validate. + Author ------ Written by Ryan Anderson diff --git a/git-send-email.perl b/git-send-email.perl index 2c31a257e1..3467cf1cc8 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -65,7 +65,7 @@ Options: --smtp-ssl * Deprecated. Use '--smtp-encryption ssl'. --quiet * Output one line of info per email. --dry-run * Don't actually send the emails. - --no-validate * Don't perform sanity checks on patches. + --[no-]validate * Perform patch sanity checks. Default on. EOT exit(1); @@ -147,7 +147,7 @@ my ($quiet, $dry_run) = (0, 0); my ($thread, $chain_reply_to, $suppress_from, $signed_off_cc, $cc_cmd); my ($smtp_server, $smtp_server_port, $smtp_authuser, $smtp_encryption); my ($identity, $aliasfiletype, @alias_files, @smtp_host_parts); -my ($no_validate); +my ($validate); my (@suppress_cc); my %config_bool_settings = ( @@ -155,6 +155,7 @@ my %config_bool_settings = ( "chainreplyto" => [\$chain_reply_to, 1], "suppressfrom" => [\$suppress_from, undef], "signedoffcc" => [\$signed_off_cc, undef], + "validate" => [\$validate, 1], ); my %config_settings = ( @@ -221,7 +222,7 @@ my $rc = GetOptions("sender|from=s" => \$sender, "dry-run" => \$dry_run, "envelope-sender=s" => \$envelope_sender, "thread!" => \$thread, - "no-validate" => \$no_validate, + "validate!" => \$validate, ); unless ($rc) { @@ -374,7 +375,7 @@ for my $f (@ARGV) { } } -if (!$no_validate) { +if ($validate) { foreach my $f (@files) { unless (-p $f) { my $error = validate_patch($f); -- 2.11.4.GIT