tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/Documentation/git-send-email.adoc b/Documentation/git-send-email.adoc
2index 7f223db42d..7e46a07d31 100644
3--- a/Documentation/git-send-email.adoc
4+++ b/Documentation/git-send-email.adoc
5@@ -177,7 +177,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@@ -233,9 +233,9 @@ a password is obtained using 'git-credential'.
15 --smtp-server=<host>::
16 If set, specifies the outgoing SMTP server to use (e.g.
17 `smtp.example.com` or a raw IP address). If unspecified, and if
18- `--sendmail-cmd` is also unspecified, the default is to search
19- for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a
20- program is available, falling back to `localhost` otherwise.
21+ `--sendmail-cmd` is also unspecified, the default is to search for
22+ `sendmail` in $PATH if such a program is available, falling back to
23+ `localhost` otherwise.
24 +
25 For backward compatibility, this option can also specify a full pathname
26 of a sendmail-like program instead; the program must support the `-i`
27diff --git a/git-send-email.perl b/git-send-email.perl
28index 798d59b84f..69c9cc2a7d 100755
29--- a/git-send-email.perl
30+++ b/git-send-email.perl
31@@ -1091,8 +1091,7 @@ sub expand_one_alias {
32 }
33
34 if (!defined $sendmail_cmd && !defined $smtp_server) {
35- my @sendmail_paths = qw( /usr/sbin/sendmail /usr/lib/sendmail );
36- push @sendmail_paths, map {"$_/sendmail"} split /:/, $ENV{PATH};
37+ my @sendmail_paths = map {"$_/sendmail"} split /:/, $ENV{PATH};
38 foreach (@sendmail_paths) {
39 if (-x $_) {
40 $sendmail_cmd = $_;