diff --git a/git-send-email.perl b/git-send-email.perl
index 1c6d2cc7872ab82020d9dc32ce0086b1d3139e22..4c87c20c158fe3edfd0b770f1855e67e20038e3b 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
$initial_reply_to =~ s/(^\s+|\s+$)//g;
}
+if (!$smtp_server) {
+ $smtp_server = $repo->config('sendemail.smtpserver');
+}
if (!$smtp_server) {
foreach (qw( /usr/sbin/sendmail /usr/lib/sendmail )) {
if (-x $_) {
$2, $_) unless $quiet;
push @cc, $2;
}
- elsif (/^[-A-Za-z]+:\s+\S/) {
+ elsif (!/^Date:\s/ && /^[-A-Za-z]+:\s+\S/) {
push @xh, $_;
}