diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-31 18:24:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-31 18:24:45 -0700 |
| commit | 5f625247ee64276a5ea51359c685be7ddefcfc59 (patch) | |
| tree | 21e3269177b075a85e5b8be7f141abb98ce1d6b1 /git-send-email.perl | |
| parent | Merge branch 'nh/http' into next (diff) | |
| parent | send-email: only 'require' instead of 'use' Net::SMTP (diff) | |
| download | git-5f625247ee64276a5ea51359c685be7ddefcfc59.tar.gz git-5f625247ee64276a5ea51359c685be7ddefcfc59.zip | |
Merge branch 'master' into next
* master:
send-email: only 'require' instead of 'use' Net::SMTP
Allow multiple -m options to git-commit.
Diffstat (limited to 'git-send-email.perl')
| -rwxr-xr-x | git-send-email.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index 0e368fff0c..ed1d89b3f7 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -21,7 +21,6 @@ use warnings; use Term::ReadLine; use Getopt::Long; use Data::Dumper; -use Net::SMTP; # most mail servers generate the Date: header, but not all... $ENV{LC_ALL} = 'C'; @@ -394,6 +393,7 @@ X-Mailer: git-send-email $gitversion print $sm "$header\n$message"; close $sm or die $?; } else { + require Net::SMTP; $smtp ||= Net::SMTP->new( $smtp_server ); $smtp->mail( $from ) or die $smtp->message; $smtp->to( @recipients ) or die $smtp->message; |