3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch

29 lines
1.2 KiB
Diff
Raw Normal View History

diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
2019-02-25 18:26:30 +00:00
index 1afe9fc858..05dd7c3a90 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
2019-02-25 18:26:30 +00:00
@@ -215,8 +215,7 @@ a password is obtained using 'git-credential'.
specify a full pathname of a sendmail-like program instead;
the program must support the `-i` option. Default value can
be specified by the `sendemail.smtpServer` configuration
2018-01-18 14:13:17 +00:00
- option; the built-in default is to search for `sendmail` in
- `/usr/sbin`, `/usr/lib` and $PATH if such program is
2018-04-09 09:02:57 +01:00
+ option; the built-in default is to search in $PATH if such program is
2018-01-18 14:13:17 +00:00
available, falling back to `localhost` otherwise.
2019-02-25 18:26:30 +00:00
--smtp-server-port=<port>::
diff --git a/git-send-email.perl b/git-send-email.perl
2019-02-25 18:26:30 +00:00
index 8eb63b5a2f..74a61d8213 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
2019-02-25 18:26:30 +00:00
@@ -956,8 +956,7 @@ sub expand_one_alias {
}
2019-02-25 18:26:30 +00:00
if (!defined $smtp_server) {
2018-01-18 14:13:17 +00:00
- 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};
2018-01-18 14:13:17 +00:00
foreach (@sendmail_paths) {
if (-x $_) {
$smtp_server = $_;