diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-12-14 00:28:56 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-12-14 00:28:56 +0300 |
commit | 577051bca44077b29f625cf14cac9360b2d11be9 (patch) | |
tree | 14219c4fd8da5174bff23670c3e764851c57105f | |
parent | d22512e0191dfceec72fadc6f2ad3690d4f9ca56 (diff) | |
parent | 1ab2fd4f397d8891f5345f876d42ab360859bcca (diff) |
Merge branch 'fk/sendmail-from-path'
"git send-email" tries to see if the sendmail program is available
in /usr/lib and /usr/sbin; extend the list of locations to be
checked to also include directories on $PATH.
* fk/sendmail-from-path:
git-send-email: honor $PATH for sendmail binary
-rw-r--r-- | Documentation/git-send-email.txt | 6 | ||||
-rwxr-xr-x | git-send-email.perl | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index bac9014ac7..8060ea35c5 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -203,9 +203,9 @@ a password is obtained using 'git-credential'. specify a full pathname of a sendmail-like program instead; 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. + option; the built-in default is to search for `sendmail` in + `/usr/sbin`, `/usr/lib` and $PATH if such program is + available, falling back to `localhost` otherwise. --smtp-server-port=<port>:: Specifies a port different from the default port (SMTP diff --git a/git-send-email.perl b/git-send-email.perl index 2208dcc213..edcc6d3469 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -885,7 +885,9 @@ if (defined $initial_reply_to) { } if (!defined $smtp_server) { - foreach (qw( /usr/sbin/sendmail /usr/lib/sendmail )) { + my @sendmail_paths = qw( /usr/sbin/sendmail /usr/lib/sendmail ); + push @sendmail_paths, map {"$_/sendmail"} split /:/, $ENV{PATH}; + foreach (@sendmail_paths) { if (-x $_) { $smtp_server = $_; last; |