send-email: signedoffcc -> signedoffbycc, but handle both
The documentation now mentions sendemail.signedoffbycc instead of sendemail.signedoffcc in order to match with the options --signed-off-by-cc; the code has been updated to reflect this as well, but sendemail.signedoffcc is still handled. Signed-off-by: Michael Witten <mfwitten@mit.edu> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Michael Witten committed
Sep 30, 2008 at 07:58 UTC
ddc3d4fe84d245b81afddf305b7d92ae1f0bc556
2 files changed
+6
-5
Documentation/git-send-email.txt
+1
-1
@@ -144,7 +144,7 @@ Automating
144
145
--[no-]signed-off-by-cc::
146
If this is set, add emails found in Signed-off-by: or Cc: lines to the
147
- cc list. Default is the value of 'sendemail.signedoffcc' configuration
147
+ cc list. Default is the value of 'sendemail.signedoffbycc' configuration
148
value; if that is unspecified, default to --signed-off-by-cc.
149
150
--suppress-cc::
git-send-email.perl
+5
-4
@@ -151,7 +151,7 @@ if ($@) {
151
my ($quiet, $dry_run) = (0, 0);
152
153
# Variables with corresponding config settings
154
-my ($thread, $chain_reply_to, $suppress_from, $signed_off_cc, $cc_cmd);
154
+my ($thread, $chain_reply_to, $suppress_from, $signed_off_by_cc, $cc_cmd);
155
my ($smtp_server, $smtp_server_port, $smtp_authuser, $smtp_encryption);
156
my ($identity, $aliasfiletype, @alias_files, @smtp_host_parts);
157
my ($validate);
@@ -161,7 +161,8 @@ my %config_bool_settings = (
161
"thread" => [\$thread, 1],
162
"chainreplyto" => [\$chain_reply_to, 1],
163
"suppressfrom" => [\$suppress_from, undef],
164
- "signedoffcc" => [\$signed_off_cc, undef],
164
+ "signedoffbycc" => [\$signed_off_by_cc, undef],
165
+ "signedoffcc" => [\$signed_off_by_cc, undef], # Deprecated
166
"validate" => [\$validate, 1],
167
);
168
@@ -225,7 +226,7 @@ my $rc = GetOptions("sender|from=s" => \$sender,
226
"cc-cmd=s" => \$cc_cmd,
227
"suppress-from!" => \$suppress_from,
228
"suppress-cc=s" => \@suppress_cc,
228
- "signed-off-cc|signed-off-by-cc!" => \$signed_off_cc,
229
+ "signed-off-cc|signed-off-by-cc!" => \$signed_off_by_cc,
230
"dry-run" => \$dry_run,
231
"envelope-sender=s" => \$envelope_sender,
232
"thread!" => \$thread,
@@ -301,7 +302,7 @@ if ($suppress_cc{'all'}) {
302
303
# If explicit old-style ones are specified, they trump --suppress-cc.
304
$suppress_cc{'self'} = $suppress_from if defined $suppress_from;
304
-$suppress_cc{'sob'} = !$signed_off_cc if defined $signed_off_cc;
305
+$suppress_cc{'sob'} = !$signed_off_by_cc if defined $signed_off_by_cc;
306
307
# Debugging, print out the suppressions.
308
if (0) {