at master 1.6 kB view raw
1diff --git a/Documentation/git-send-email.adoc b/Documentation/git-send-email.adoc 2index 5d13a856a7..5c9978c1e4 100644 3--- a/Documentation/git-send-email.adoc 4+++ b/Documentation/git-send-email.adoc 5@@ -190,7 +190,7 @@ Sending 6 The command will be executed in the shell if necessary. Default 7 is the value of `sendemail.sendmailCmd`. If unspecified, and if 8 `--smtp-server` is also unspecified, `git send-email` will search 9- for `sendmail` in `/usr/sbin`, `/usr/lib` and `$PATH`. 10+ for `sendmail` in `$PATH`. 11 12 --smtp-encryption=<encryption>:: 13 Specify in what way encrypting begins for the SMTP connection. 14@@ -247,7 +247,7 @@ a password is obtained using linkgit:git-credential[1]. 15 If set, specifies the outgoing SMTP server to use (e.g. 16 `smtp.example.com` or a raw IP address). If unspecified, and if 17 `--sendmail-cmd` is also unspecified, the default is to search 18- for `sendmail` in `/usr/sbin`, `/usr/lib` and `$PATH` if such a 19+ for `sendmail` in `$PATH` if such a 20 program is available, falling back to `localhost` otherwise. 21 + 22 For backward compatibility, this option can also specify a full pathname 23diff --git a/git-send-email.perl b/git-send-email.perl 24index 798d59b84f..69c9cc2a7d 100755 25--- a/git-send-email.perl 26+++ b/git-send-email.perl 27@@ -1091,8 +1091,7 @@ sub expand_one_alias { 28 } 29 30 if (!defined $sendmail_cmd && !defined $smtp_server) { 31- my @sendmail_paths = qw( /usr/sbin/sendmail /usr/lib/sendmail ); 32- push @sendmail_paths, map {"$_/sendmail"} split /:/, $ENV{PATH}; 33+ my @sendmail_paths = map {"$_/sendmail"} split /:/, $ENV{PATH}; 34 foreach (@sendmail_paths) { 35 if (-x $_) { 36 $sendmail_cmd = $_;