diff options
| author | Sergey Vlasov <vsu@altlinux.ru> | 2006-10-29 19:31:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-29 20:45:23 (GMT) |
| commit | 6dcfa306f2b67b733a7eb2d7ded1bc9987809edb (patch) | |
| tree | ed4a62ffbc9a8ab474b3dcc7db13b185de98cdfc | |
| parent | 9c572b21dd090a1e5c5bb397053bf8043ffe7fb4 (diff) | |
| download | git-6dcfa306f2b67b733a7eb2d7ded1bc9987809edb.zip git-6dcfa306f2b67b733a7eb2d7ded1bc9987809edb.tar.gz git-6dcfa306f2b67b733a7eb2d7ded1bc9987809edb.tar.bz2 | |
git-send-email: Read the default SMTP server from the GIT config file
Make the default value for --smtp-server configurable through the
'sendemail.smtpserver' option in .git/config (or $HOME/.gitconfig).
Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Acked-by: Ryan Anderson <rda@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Documentation/git-send-email.txt | 8 | ||||
| -rwxr-xr-x | git-send-email.perl | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index ec0e201..4c8d907 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -68,9 +68,11 @@ The options available are: --smtp-server:: If set, specifies the outgoing SMTP server to use. A full pathname of a sendmail-like program can be specified instead; - the program must support the `-i` option. Defaults to - `/usr/sbin/sendmail` or `/usr/lib/sendmail` if such program is - available, or to `localhost` otherwise. + the program must support the `-i` option. Default value can + be specified by the 'sendemail.smtpserver' configuration + option; the built-in default is `/usr/sbin/sendmail` or + `/usr/lib/sendmail` if such program is available, or + `localhost` otherwise. --subject:: Specify the initial subject of the email thread. diff --git a/git-send-email.perl b/git-send-email.perl index c42dc3b..4c87c20 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -231,6 +231,9 @@ if (!defined $initial_reply_to && $prompting) { } if (!$smtp_server) { + $smtp_server = $repo->config('sendemail.smtpserver'); +} +if (!$smtp_server) { foreach (qw( /usr/sbin/sendmail /usr/lib/sendmail )) { if (-x $_) { $smtp_server = $_; |