Make git-send-email aware of Cc: lines.

In the Linux kernel, for example, it's common to include Cc: lines
for cases when you want to remember to cc someone on a patch without
necessarily claiming they signed off on it.  Make git-send-email
aware of these.

Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 9b3aabb6fe5590f41319298337e8f9ea6d9fff4e..682313e95dc9b96d3cc14f33554ad82bcede9a56 100644 (file)
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -60,7 +60,8 @@ The --cc option must be repeated for each user you want on the cc list.
        is not set, this will be prompted for.
 
 --no-signed-off-by-cc::
        is not set, this will be prompted for.
 
 --no-signed-off-by-cc::

-       Do not add emails found in Signed-off-by: lines to the cc list.
+       Do not add emails found in Signed-off-by: or Cc: lines to the
+       cc list.

 
 --quiet::
        Make git-send-email less verbose.  One line per email should be
 
 --quiet::
        Make git-send-email less verbose.  One line per email should be

diff --git a/git-send-email.perl b/git-send-email.perl
index 6989c0260fcafe29397c89cfcc61a8ef9a49d58e..ae50990d081c3709c0a498422be382b9a632f5ec 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -65,8 +65,8 @@ sub usage {
                   Defaults to on.
 
    --no-signed-off-cc Suppress the automatic addition of email addresses
                   Defaults to on.
 
    --no-signed-off-cc Suppress the automatic addition of email addresses

-                 that appear in a Signed-off-by: line, to the cc: list.
-                Note: Using this option is not recommended.
+                 that appear in Signed-off-by: or Cc: lines to the cc:
+                 list.  Note: Using this option is not recommended.

 
    --smtp-server  If set, specifies the outgoing SMTP server to use.
                   Defaults to localhost.
 
    --smtp-server  If set, specifies the outgoing SMTP server to use.
                   Defaults to localhost.


@@ -572,8 +572,8 @@ sub send_message
                        }
                } else {
                        $message .=  $_;
                        }
                } else {
                        $message .=  $_;

-                       if (/^Signed-off-by: (.*)$/i && !$no_signed_off_cc) {
-                               my $c = $1;
+                       if (/^(Signed-off-by|Cc): (.*)$/i && !$no_signed_off_cc) {
+                               my $c = $2;

                                chomp $c;
                                push @cc, $c;
                                printf("(sob) Adding cc: %s from line '%s'\n",
                                chomp $c;
                                push @cc, $c;
                                printf("(sob) Adding cc: %s from line '%s'\n",