Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
1diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt 2index 3db4eab4ba..39bc0e77c9 100644 3--- a/Documentation/git-send-email.txt 4+++ b/Documentation/git-send-email.txt 5@@ -220,9 +220,9 @@ a password is obtained using 'git-credential'. 6 --smtp-server=<host>:: 7 If set, specifies the outgoing SMTP server to use (e.g. 8 `smtp.example.com` or a raw IP address). If unspecified, and if 9- `--sendmail-cmd` is also unspecified, the default is to search 10- for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a 11- program is available, falling back to `localhost` otherwise. 12+ `--sendmail-cmd` is also unspecified, the default is to search for 13+ `sendmail` in $PATH if such a program is available, falling back to 14+ `localhost` otherwise. 15 + 16 For backward compatibility, this option can also specify a full pathname 17 of a sendmail-like program instead; the program must support the `-i` 18diff --git a/git-send-email.perl b/git-send-email.perl 19index e65d969d0b..508d49483d 100755 20--- a/git-send-email.perl 21+++ b/git-send-email.perl 22@@ -1066,8 +1066,7 @@ sub expand_one_alias { 23 } 24 25 if (!defined $sendmail_cmd && !defined $smtp_server) { 26- my @sendmail_paths = qw( /usr/sbin/sendmail /usr/lib/sendmail ); 27- push @sendmail_paths, map {"$_/sendmail"} split /:/, $ENV{PATH}; 28+ my @sendmail_paths = map {"$_/sendmail"} split /:/, $ENV{PATH}; 29 foreach (@sendmail_paths) { 30 if (-x $_) { 31 $sendmail_cmd = $_;