about summary refs log tree commit diff
path: root/nixpkgs/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch
blob: 9603d8e27c5c0b13ed8d856b43256d751d5ab594 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 1afe9fc858..05dd7c3a90 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -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
-	option; the built-in default is to search for `sendmail` in
-	`/usr/sbin`, `/usr/lib` and $PATH if such program is
+	option; the built-in default is to search in $PATH if such program is
 	available, falling back to `localhost` otherwise.
 
 --smtp-server-port=<port>::
diff --git a/git-send-email.perl b/git-send-email.perl
index 8eb63b5a2f..74a61d8213 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -956,8 +956,7 @@ sub expand_one_alias {
 }
 
 if (!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 $_) {
 			$smtp_server = $_;