[PATCH] New git-apply test cases for scanning forwards and backwards.

[git.git] / git-send-email-script

diff --git a/git-send-email-script b/git-send-email-script
index 4927cec..1dbdbaf 100755 (executable)
--- a/git-send-email-script
+++ b/git-send-email-script
@@ -4,17 +4,17 @@
 # Copyright 2005 Ryan Anderson <ryan@michonline.com>
 #
 # GPL v2 (See COPYING)
-# 
+#
 # Ported to support git "mbox" format files by Ryan Anderson <ryan@michonline.com>
 #
 # Sends a collection of emails to the given email addresses, disturbingly fast.
-# 
+#
 # Supports two formats:
 # 1. mbox format files (ignoring most headers and MIME formatting - this is designed for sending patches)
 # 2. The original format support by Greg's script:
-#    first line of the message is who to CC, 
+#    first line of the message is who to CC,
 #    and second line is the subject of the message.
-# 
+#
 
 use strict;
 use warnings;
@@ -24,6 +24,8 @@ use Getopt::Long;
 use Data::Dumper;
 use Email::Valid;
 
+sub unique_email_list(@);
+
 # Variables we fill in automatically, or via prompting:
 my (@to,@cc,$initial_reply_to,$initial_subject,@files,$from);
 
@@ -73,7 +75,7 @@ if (!defined $from) {
        do {
                $_ = $term->readline("Who should the emails appear to be from? ",
                        $from);
-       while (!defined $_);
+       } while (!defined $_);
 
        $from = $_;
        print "Emails will be sent from: ", $from, "\n";
@@ -81,7 +83,7 @@ if (!defined $from) {
 
 if (!@to) {
        do {
-               $_ = $term->readline("Who should the emails be sent to? ", 
+               $_ = $term->readline("Who should the emails be sent to? ",
                                "");
        } while (!defined $_);
        my $to = $_;
@@ -90,7 +92,7 @@ if (!@to) {
 
 if (!defined $initial_subject) {
        do {
-               $_ = $term->readline("What subject should the emails start with? ", 
+               $_ = $term->readline("What subject should the emails start with? ",
                        $initial_subject);
        } while (!defined $_);
        $initial_subject = $_;
@@ -98,7 +100,7 @@ if (!defined $initial_subject) {
 
 if (!defined $initial_reply_to) {
        do {
-               $_= $term->readline("Message-ID to be used as In-Reply-To? ", 
+               $_= $term->readline("Message-ID to be used as In-Reply-To? ",
                        $initial_reply_to);
        } while (!defined $_);
 
@@ -117,7 +119,7 @@ for my $f (@ARGV) {
                opendir(DH,$f)
                        or die "Failed to opendir $f: $!";
 
-               push @files, map { +$f . "/" . $_ } grep { -f $_ }
+               push @files, grep { -f $_ } map { +$f . "/" . $_ }
                                sort readdir(DH);
 
        } elsif (-f $f) {
@@ -135,11 +137,12 @@ if (@files) {
 git-send-email-script [options] <file | directory> [... file | directory ]
 Options:
    --from         Specify the "From:" line of the email to be sent.
-   --to                  Specify the primary "To:" line of the email.
+   --to           Specify the primary "To:" line of the email.
    --subject      Specify the initial "Subject:" line.
    --in-reply-to  Specify the first "In-Reply-To:" header line.
-   --chain-reply-to If set, the replies will all be to the first
-                 email sent, rather than to the last email sent.
+   --chain-reply-to If set, the replies will all be to the previous
+                  email sent, rather than to the first email sent.
+                  Defaults to on.
    --smtp-server  If set, specifies the outgoing SMTP server to use.
                   Defaults to localhost.
 
@@ -161,7 +164,7 @@ our ($message_id, $cc, %mail, $subject, $reply_to, $message);
 
 # We'll setup a template for the message id, using the "from" address:
 my $message_id_from = Email::Valid->address($from);
-my $message_id_template = "<%s-git-send-email-$from>";
+my $message_id_template = "<%s-git-send-email-$message_id_from>";
 
 sub make_message_id
 {
@@ -178,10 +181,7 @@ $cc = "";
 
 sub send_message
 {
-       my %to;
-       $to{lc(Email::Valid->address($_))}++ for (@to);
-
-       my $to = join(",", keys %to);
+       my $to = join (", ", unique_email_list(@to));
 
        %mail = (       To      =>      $to,
                        From    =>      $from,
@@ -249,7 +249,7 @@ foreach my $t (@files) {
                                        $subject = $_;
                                }
                        }
-                       
+
                        # A whitespace line will terminate the headers
                        if (m/^\s*$/) {
                                $header_done = 1;
@@ -267,10 +267,7 @@ foreach my $t (@files) {
        }
        close F;
 
-       my %clean_ccs;
-       $clean_ccs{lc(Email::Valid->address($_))}++ for @cc;
-
-       $cc = join(",", keys %clean_ccs);
+       $cc = join(", ", unique_email_list(@cc));
 
        send_message();
 
@@ -279,5 +276,17 @@ foreach my $t (@files) {
                $reply_to = $message_id;
        }
        make_message_id();
-#      $subject = "Re: ".$initial_subject;
+}
+
+
+sub unique_email_list(@) {
+       my %seen;
+       my @emails;
+
+       foreach my $entry (@_) {
+               my $clean = Email::Valid->address($entry);
+               next if $seen{$clean}++;
+               push @emails, $entry;
+       }
+       return @emails;
 }