From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Mar 2015 22:37:03 +0000 (-0800)
Subject: Merge branch 'km/send-email-getopt-long-workarounds'
X-Git-Tag: v2.4.0-rc0~77
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0278b3f609f13ecc9d4a31e39057a7c9edf80ec5?ds=inline;hp=-c

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
---

0278b3f609f13ecc9d4a31e39057a7c9edf80ec5
diff --combined git-send-email.perl
index 848f17623a,a18a7959ed..e1e9b1460c
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@@ -299,6 -299,7 +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 +312,34 @@@
  		    "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;
@@@ -752,7 -762,6 +762,7 @@@ if (!defined $auto_8bit_encoding && sca
  		print "    $f\n";
  	}
  	$auto_8bit_encoding = ask("Which 8bit encoding should I declare [UTF-8]? ",
 +				  valid_re => qr/.{4}/, confirm_only => 1,
  				  default => "UTF-8");
  }