git-send-email-honor-PATH.patch
28 lines
| 1.2 KiB
| text/x-diff
|
DiffLexer
| r584 | diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt | |||
| r724 | index 1afe9fc858..05dd7c3a90 100644 | |||
| r584 | --- a/Documentation/git-send-email.txt | |||
| +++ b/Documentation/git-send-email.txt | ||||
| r724 | @@ -215,8 +215,7 @@ a password is obtained using 'git-credential'. | |||
| r584 | 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 to search for `sendmail` in | ||||
| - `/usr/sbin`, `/usr/lib` and $PATH if such program is | ||||
| + option; the built-in default is to search in $PATH if such program is | ||||
| available, falling back to `localhost` otherwise. | ||||
| --smtp-server-port=<port>:: | ||||
| diff --git a/git-send-email.perl b/git-send-email.perl | ||||
| r724 | index 8eb63b5a2f..74a61d8213 100755 | |||
| r584 | --- a/git-send-email.perl | |||
| +++ b/git-send-email.perl | ||||
| r724 | @@ -956,8 +956,7 @@ sub expand_one_alias { | |||
| r584 | } | |||
| if (!defined $smtp_server) { | ||||
| - my @sendmail_paths = qw( /usr/sbin/sendmail /usr/lib/sendmail ); | ||||
| - push @sendmail_paths, map {"$_/sendmail"} split /:/, $ENV{PATH}; | ||||
| + my @sendmail_paths = map {"$_/sendmail"} split /:/, $ENV{PATH}; | ||||
| foreach (@sendmail_paths) { | ||||
| if (-x $_) { | ||||
| $smtp_server = $_; | ||||
