Aliaksandr
37 lines
1.6 KiB
Diff
37 lines
1.6 KiB
Diff
diff --git a/Documentation/git-send-email.adoc b/Documentation/git-send-email.adoc
|
|
index 5d13a856a7..5c9978c1e4 100644
|
|
--- a/Documentation/git-send-email.adoc
|
|
+++ b/Documentation/git-send-email.adoc
|
|
@@ -190,7 +190,7 @@ Sending
|
|
The command will be executed in the shell if necessary. Default
|
|
is the value of `sendemail.sendmailCmd`. If unspecified, and if
|
|
`--smtp-server` is also unspecified, `git send-email` will search
|
|
- for `sendmail` in `/usr/sbin`, `/usr/lib` and `$PATH`.
|
|
+ for `sendmail` in `$PATH`.
|
|
|
|
--smtp-encryption=<encryption>::
|
|
Specify in what way encrypting begins for the SMTP connection.
|
|
@@ -247,7 +247,7 @@ a password is obtained using linkgit:git-credential[1].
|
|
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
|
|
+ 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
|
|
diff --git a/git-send-email.perl b/git-send-email.perl
|
|
index 798d59b84f..69c9cc2a7d 100755
|
|
--- a/git-send-email.perl
|
|
+++ b/git-send-email.perl
|
|
@@ -1091,8 +1091,7 @@ sub expand_one_alias {
|
|
}
|
|
|
|
if (!defined $sendmail_cmd && !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 $_) {
|
|
$sendmail_cmd = $_;
|