зеркало из https://github.com/microsoft/git.git
Merge branch 'km/send-email-getopt-long-workarounds'
Even though we officially haven't dropped Perl 5.8 support, the Getopt::Long package that came with it does not support "--no-" prefix to negate a boolean option; manually add support to help people with older Getopt::Long package. * km/send-email-getopt-long-workarounds: git-send-email.perl: support no- prefix with older GetOptions
This commit is contained in:
Коммит
0278b3f609
|
@ -299,6 +299,7 @@ my $rc = GetOptions("h" => \$help,
|
|||
"bcc=s" => \@bcclist,
|
||||
"no-bcc" => \$no_bcc,
|
||||
"chain-reply-to!" => \$chain_reply_to,
|
||||
"no-chain-reply-to" => sub {$chain_reply_to = 0},
|
||||
"smtp-server=s" => \$smtp_server,
|
||||
"smtp-server-option=s" => \@smtp_server_options,
|
||||
"smtp-server-port=s" => \$smtp_server_port,
|
||||
|
@ -311,25 +312,34 @@ my $rc = GetOptions("h" => \$help,
|
|||
"smtp-domain:s" => \$smtp_domain,
|
||||
"identity=s" => \$identity,
|
||||
"annotate!" => \$annotate,
|
||||
"no-annotate" => sub {$annotate = 0},
|
||||
"compose" => \$compose,
|
||||
"quiet" => \$quiet,
|
||||
"cc-cmd=s" => \$cc_cmd,
|
||||
"suppress-from!" => \$suppress_from,
|
||||
"no-suppress-from" => sub {$suppress_from = 0},
|
||||
"suppress-cc=s" => \@suppress_cc,
|
||||
"signed-off-cc|signed-off-by-cc!" => \$signed_off_by_cc,
|
||||
"no-signed-off-cc|no-signed-off-by-cc" => sub {$signed_off_by_cc = 0},
|
||||
"cc-cover|cc-cover!" => \$cover_cc,
|
||||
"no-cc-cover" => sub {$cover_cc = 0},
|
||||
"to-cover|to-cover!" => \$cover_to,
|
||||
"no-to-cover" => sub {$cover_to = 0},
|
||||
"confirm=s" => \$confirm,
|
||||
"dry-run" => \$dry_run,
|
||||
"envelope-sender=s" => \$envelope_sender,
|
||||
"thread!" => \$thread,
|
||||
"no-thread" => sub {$thread = 0},
|
||||
"validate!" => \$validate,
|
||||
"no-validate" => sub {$validate = 0},
|
||||
"transfer-encoding=s" => \$target_xfer_encoding,
|
||||
"format-patch!" => \$format_patch,
|
||||
"no-format-patch" => sub {$format_patch = 0},
|
||||
"8bit-encoding=s" => \$auto_8bit_encoding,
|
||||
"compose-encoding=s" => \$compose_encoding,
|
||||
"force" => \$force,
|
||||
"xmailer!" => \$use_xmailer,
|
||||
"no-xmailer" => sub {$use_xmailer = 0},
|
||||
);
|
||||
|
||||
usage() if $help;
|
||||
|
|
|
@ -392,7 +392,7 @@ test_expect_success $PREREQ 'allow long lines with --no-validate' '
|
|||
--from="Example <nobody@example.com>" \
|
||||
--to=nobody@example.com \
|
||||
--smtp-server="$(pwd)/fake.sendmail" \
|
||||
--novalidate \
|
||||
--no-validate \
|
||||
$patches longline.patch \
|
||||
2>errors
|
||||
'
|
||||
|
@ -426,7 +426,7 @@ test_expect_success $PREREQ 'In-Reply-To without --chain-reply-to' '
|
|||
git send-email \
|
||||
--from="Example <nobody@example.com>" \
|
||||
--to=nobody@example.com \
|
||||
--nochain-reply-to \
|
||||
--no-chain-reply-to \
|
||||
--in-reply-to="$(cat expect)" \
|
||||
--smtp-server="$(pwd)/fake.sendmail" \
|
||||
$patches $patches $patches \
|
||||
|
@ -1067,7 +1067,7 @@ test_expect_success $PREREQ 'in-reply-to but no threading' '
|
|||
--from="Example <nobody@example.com>" \
|
||||
--to=nobody@example.com \
|
||||
--in-reply-to="<in-reply-id@example.com>" \
|
||||
--nothread \
|
||||
--no-thread \
|
||||
$patches |
|
||||
grep "In-Reply-To: <in-reply-id@example.com>"
|
||||
'
|
||||
|
@ -1077,7 +1077,7 @@ test_expect_success $PREREQ 'no in-reply-to and no threading' '
|
|||
--dry-run \
|
||||
--from="Example <nobody@example.com>" \
|
||||
--to=nobody@example.com \
|
||||
--nothread \
|
||||
--no-thread \
|
||||
$patches $patches >stdout &&
|
||||
! grep "In-Reply-To: " stdout
|
||||
'
|
||||
|
@ -1088,7 +1088,7 @@ test_expect_success $PREREQ 'threading but no chain-reply-to' '
|
|||
--from="Example <nobody@example.com>" \
|
||||
--to=nobody@example.com \
|
||||
--thread \
|
||||
--nochain-reply-to \
|
||||
--no-chain-reply-to \
|
||||
$patches $patches >stdout &&
|
||||
grep "In-Reply-To: " stdout
|
||||
'
|
||||
|
|
Загрузка…
Ссылка в новой задаче