From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 8 Mar 2008 06:12:13 +0000 (-0800)
Subject: send-email: --no-signed-off-cc should suppress 'sob' cc
X-Git-Tag: v1.5.5-rc0~55
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ba51795c5fc32a507df9f91ffeae21893e9e7633;p=git.git

send-email: --no-signed-off-cc should suppress 'sob' cc

The logic to countermand suppression of Cc to the signers with a more
explicit --signed-off-by option done in 6564828 (git-send-email:
Generalize auto-cc recipient mechanism) suffers from a double-negation
error.

A --signed-off-cc option, when false, should actively suppress CC: to be
generated out of S-o-b lines, and it should refrain from suppressing when
it is true.

It also fixes "(sob) Adding cc:" status output; earlier it included the
line terminator LF inside '%s', which was totally bogus.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-send-email.perl b/git-send-email.perl
index 29b1105c4..be4a20d7c 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -317,7 +317,7 @@ if ($suppress_cc{'all'}) {
 
 # If explicit old-style ones are specified, they trump --suppress-cc.
 $suppress_cc{'self'} = $suppress_from if defined $suppress_from;
-$suppress_cc{'sob'} = $signed_off_cc if defined $signed_off_cc;
+$suppress_cc{'sob'} = !$signed_off_cc if defined $signed_off_cc;
 
 # Debugging, print out the suppressions.
 if (0) {
@@ -855,6 +855,7 @@ foreach my $t (@files) {
 			$message .=  $_;
 			if (/^(Signed-off-by|Cc): (.*)$/i) {
 				next if ($suppress_cc{'sob'});
+				chomp;
 				my $c = $2;
 				chomp $c;
 				next if ($c eq $sender and $suppress_cc{'self'});