diff options
| author |  Ryan Anderson <ryan@michonline.com> | 2006-02-13 02:57:09 -0500 |
|---|---|---|
| committer | Ryan Anderson <ryan@michonline.com> | 2006-02-13 03:32:01 -0500 |
| commit | a985d595ada7914e217cbec75470f2950d41505b (patch) | |
| tree | 7b884c487d644642a7223359a6346f7155724e60 | |
| parent | GIT 1.2.0 (diff) | |
| download | tgif-a985d595ada7914e217cbec75470f2950d41505b.tar.xz | |
send-email: Add some options for controlling how addresses are automatically added to the cc: list.
Signed-off-by: Ryan Anderson <ryan@michonline.com>
| -rw-r--r-- | Documentation/git-send-email.txt | 7 | ||||
| -rwxr-xr-x | git-send-email.perl | 15 |
2 files changed, 19 insertions, 3 deletions
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index 00537d8907..c2f52f58af 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -48,6 +48,9 @@ The options available are: Only necessary if --compose is also set. If --compose is not set, this will be prompted for. +--no-signed-off-by-cc:: + Do not add emails foudn in Signed-off-by: lines to the cc list. + --quiet:: Make git-send-email less verbose. One line per email should be all that is output. @@ -61,6 +64,10 @@ The options available are: Only necessary if --compose is also set. If --compose is not set, this will be prompted for. +--suppress-from:: + Do not add the From: address to the cc: list, if it shows up in a From: + line. + --to:: Specify the primary recipient of the emails generated. Generally, this will be the upstream maintainer of the diff --git a/git-send-email.perl b/git-send-email.perl index 3f1b3ca788..abffca5188 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -34,7 +34,7 @@ my $compose_filename = ".msg.$$"; my (@to,@cc,$initial_reply_to,$initial_subject,@files,$from,$compose); # Behavior modification variables -my ($chain_reply_to, $smtp_server, $quiet) = (1, "localhost", 0); +my ($chain_reply_to, $smtp_server, $quiet, $suppress_from, $no_signed_off_cc) = (1, "localhost", 0, 0, 0); # Example reply to: #$initial_reply_to = ''; #<20050203173208.GA23964@foobar.com>'; @@ -52,6 +52,8 @@ my $rc = GetOptions("from=s" => \$from, "smtp-server=s" => \$smtp_server, "compose" => \$compose, "quiet" => \$quiet, + "suppress-from" => \$suppress_from, + "no-signed-off-cc" => \$no_signed_off_cc, ); # Now, let's fill any that aren't set in with defaults: @@ -212,13 +214,19 @@ Options: email sent, rather than to the first email sent. 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. + --smtp-server If set, specifies the outgoing SMTP server to use. Defaults to localhost. + --suppress-from Supress sending emails to yourself if your address + appears in a From: line. + --quiet Make git-send-email less verbose. One line per email should be all that is output. - Error: Please specify a file or a directory on the command line. EOT exit(1); @@ -304,6 +312,7 @@ foreach my $t (@files) { $subject = $1; } elsif (/^(Cc|From):\s+(.*)$/) { + next if ($2 eq $from && $suppress_from); printf("(mbox) Adding cc: %s from line '%s'\n", $2, $_) unless $quiet; push @cc, $2; @@ -332,7 +341,7 @@ foreach my $t (@files) { } } else { $message .= $_; - if (/^Signed-off-by: (.*)$/i) { + if (/^Signed-off-by: (.*)$/i && !$no_signed_off_cc) { my $c = $1; chomp $c; push @cc, $c; |