Merge branch 'jc/send-email'

* jc/send-email:
Make git-send-email detect mbox-style patches more readily
git-send-email: real name with period need to be dq-quoted on From: line
git-send-email: do not drop custom headers the user prepared

diff --combined git-send-email.perl
index 04c89422523a9272bd1ba9c3020cb12db0018cfa,eb91270898fe3e961cea626e5e43be85a08ba51d..b17d2619875112215465c7399fa30e592ed71b01
--- 1/git-send-email.perl
--- 2/git-send-email.perl
+++ b/git-send-email.perl
@@@ -83,12 -83,11 +83,12 @@@ sub cleanup_compose_files()
  my $compose_filename = ".msg.$$";
  
  # Variables we fill in automatically, or via prompting:
- my (@to,@cc,@initial_cc,@bcclist,
+ my (@to,@cc,@initial_cc,@bcclist,@xh,
        $initial_reply_to,$initial_subject,@files,$from,$compose,$time);
  
  # Behavior modification variables
 -my ($chain_reply_to, $quiet, $suppress_from, $no_signed_off_cc) = (1, 0, 0, 0);
 +my ($chain_reply_to, $quiet, $suppress_from, $no_signed_off_cc,
 +      $dry_run) = (1, 0, 0, 0, 0);
  my $smtp_server;
  
  # Example reply to:
@@@ -117,7 -116,6 +117,7 @@@ my $rc = GetOptions("from=s" => \$from
                    "quiet" => \$quiet,
                    "suppress-from" => \$suppress_from,
                    "no-signed-off-cc|no-signed-off-by-cc" => \$no_signed_off_cc,
 +                  "dry-run" => \$dry_run,
         );
  
  # Verify the user input
@@@ -411,6 -409,11 +411,11 @@@ sub send_messag
            $gitversion = Git::version();
        }
  
+       my ($author_name) = ($from =~ /^(.*?)\s+</);
+       if ($author_name =~ /\./ && $author_name !~ /^".*"$/) {
+               my ($name, $addr) = ($from =~ /^(.*?)(\s+<.*)/);
+               $from = "\"$name\"$addr";
+       }
        my $header = "From: $from
  To: $to
  Cc: $cc
@@@ -424,10 -427,11 +429,13 @@@ X-Mailer: git-send-email $gitversio
                $header .= "In-Reply-To: $reply_to\n";
                $header .= "References: $references\n";
        }
+       if (@xh) {
+               $header .= join("\n", @xh) . "\n";
+       }
  
 -      if ($smtp_server =~ m#^/#) {
 +      if ($dry_run) {
 +              # We don't want to send the email.
 +      } elsif ($smtp_server =~ m#^/#) {
                my $pid = open my $sm, '|-';
                defined $pid or die $!;
                if (!$pid) {
@@@ -476,15 -480,22 +484,22 @@@ foreach my $t (@files) 
  
        my $author_not_sender = undef;
        @cc = @initial_cc;
-       my $found_mbox = 0;
+       @xh = ();
+       my $input_format = undef;
        my $header_done = 0;
        $message = "";
        while(<F>) {
                if (!$header_done) {
-                       $found_mbox = 1, next if (/^From /);
+                       if (/^From /) {
+                               $input_format = 'mbox';
+                               next;
+                       }
                        chomp;
+                       if (!defined $input_format && /^[-A-Za-z]+:\s/) {
+                               $input_format = 'mbox';
+                       }
  
-                       if ($found_mbox) {
+                       if (defined $input_format && $input_format eq 'mbox') {
                                if (/^Subject:\s+(.*)$/) {
                                        $subject = $1;
  
@@@ -499,6 -510,9 +514,9 @@@
                                                $2, $_) unless $quiet;
                                        push @cc, $2;
                                }
+                               elsif (/^[-A-Za-z]+:\s+\S/) {
+                                       push @xh, $_;
+                               }
  
                        } else {
                                # In the traditional
@@@ -506,6 -520,7 +524,7 @@@
                                # line 1 = cc
                                # line 2 = subject
                                # So let's support that, too.
+                               $input_format = 'lots';
                                if (@cc == 0) {
                                        printf("(non-mbox) Adding cc: %s from line '%s'\n",
                                                $_, $_) unless $quiet;