git-send-email-honor-PATH.patch
30 lines
| 1.4 KiB
| text/x-diff
|
DiffLexer
r584 | diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt | ||
r1028 | index 3db4eab4ba..39bc0e77c9 100644 | ||
r584 | --- a/Documentation/git-send-email.txt | ||
+++ b/Documentation/git-send-email.txt | |||
r1028 | @@ -220,9 +220,9 @@ a password is obtained using 'git-credential'. | ||
--smtp-server=<host>:: | |||
If set, specifies the outgoing SMTP server to use (e.g. | |||
`smtp.example.com` or a raw IP address). If unspecified, and if | |||
- `--sendmail-cmd` is also unspecified, the default is to search | |||
- for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a | |||
- program is available, falling back to `localhost` otherwise. | |||
+ `--sendmail-cmd` is also unspecified, the default is to search for | |||
+ `sendmail` in $PATH if such a program is available, falling back to | |||
+ `localhost` otherwise. | |||
+ | |||
For backward compatibility, this option can also specify a full pathname | |||
of a sendmail-like program instead; the program must support the `-i` | |||
r584 | diff --git a/git-send-email.perl b/git-send-email.perl | ||
r1028 | index e65d969d0b..508d49483d 100755 | ||
r584 | --- a/git-send-email.perl | ||
+++ b/git-send-email.perl | |||
r1028 | @@ -1066,8 +1066,7 @@ sub expand_one_alias { | ||
r584 | } | ||
r1028 | if (!defined $sendmail_cmd && !defined $smtp_server) { | ||
r584 | - 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 $_) { | |||
r1028 | $sendmail_cmd = $_; |