diff options
author | Tim Steinbach <tim@nequissimus.com> | 2018-01-18 09:13:17 -0500 |
---|---|---|
committer | Tim Steinbach <tim@nequissimus.com> | 2018-01-18 09:13:17 -0500 |
commit | b5be5ef364b031df7f51babd8c15e5bd0b6fa286 (patch) | |
tree | e997ffa47a3abcc60f97f0f907a992b5d4dde437 /pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch | |
parent | 61a75a1d2285925457c8ac90f842947db1d5d137 (diff) | |
download | nixlib-b5be5ef364b031df7f51babd8c15e5bd0b6fa286.tar nixlib-b5be5ef364b031df7f51babd8c15e5bd0b6fa286.tar.gz nixlib-b5be5ef364b031df7f51babd8c15e5bd0b6fa286.tar.bz2 nixlib-b5be5ef364b031df7f51babd8c15e5bd0b6fa286.tar.lz nixlib-b5be5ef364b031df7f51babd8c15e5bd0b6fa286.tar.xz nixlib-b5be5ef364b031df7f51babd8c15e5bd0b6fa286.tar.zst nixlib-b5be5ef364b031df7f51babd8c15e5bd0b6fa286.zip |
git: 2.15.1 -> 2.16.0
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch | 45 |
1 files changed, 13 insertions, 32 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch b/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch index 1aec77504b7b..9a484262b7b2 100644 --- a/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch +++ b/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch @@ -1,47 +1,28 @@ -From 9a4396ddaedaf59ebee16d69900884e990b79cdd Mon Sep 17 00:00:00 2001 -From: Florian Klink <flokli@flokli.de> -Date: Fri, 17 Nov 2017 13:21:37 +0100 -Subject: [PATCH] git-send-email: honor $PATH - -This will search $PATH for a sendmail binary, instead of the (previously -fixed) list of paths. - -Signed-off-by: Florian Klink <flokli@flokli.de> ---- - Documentation/git-send-email.txt | 5 ++--- - git-send-email.perl | 3 ++- - 2 files changed, 4 insertions(+), 4 deletions(-) - diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt -index bac9014ac..b9b1f2c41 100644 +index 8060ea35c..c81067a19 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt -@@ -203,9 +203,8 @@ a password is obtained using 'git-credential'. +@@ -203,8 +203,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 `/usr/sbin/sendmail` or -- `/usr/lib/sendmail` if such program is available, or -- `localhost` otherwise. -+ option; the built-in default is to search in $PATH if such program is -+ available, or `localhost` otherwise. - +- 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>:: - Specifies a port different from the default port (SMTP diff --git a/git-send-email.perl b/git-send-email.perl -index 2208dcc21..8e357aeab 100755 +index edcc6d346..8e357aeab 100755 --- a/git-send-email.perl +++ b/git-send-email.perl -@@ -885,7 +885,8 @@ if (defined $initial_reply_to) { +@@ -885,8 +885,7 @@ if (defined $initial_reply_to) { } - + if (!defined $smtp_server) { -- foreach (qw( /usr/sbin/sendmail /usr/lib/sendmail )) { +- 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) { + foreach (@sendmail_paths) { if (-x $_) { $smtp_server = $_; - last; --- -2.15.0 - |