diff options
| author | Guillaume Maudoux <guillaume.maudoux@uclouvain.be> | 2018-04-09 10:02:57 +0200 |
|---|---|---|
| committer | Guillaume Maudoux <guillaume.maudoux@uclouvain.be> | 2018-04-11 17:54:08 +0200 |
| commit | ad076ff7ce5ea04d7e890934440702e0228fc660 (patch) | |
| tree | da5672c005c00d11c7101c219a973be2e2217c01 /pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch | |
| parent | 260194193c333a3d939a07989f160f3d6e1b3047 (diff) | |
| download | nixlib-ad076ff7ce5ea04d7e890934440702e0228fc660.tar nixlib-ad076ff7ce5ea04d7e890934440702e0228fc660.tar.gz nixlib-ad076ff7ce5ea04d7e890934440702e0228fc660.tar.bz2 nixlib-ad076ff7ce5ea04d7e890934440702e0228fc660.tar.lz nixlib-ad076ff7ce5ea04d7e890934440702e0228fc660.tar.xz nixlib-ad076ff7ce5ea04d7e890934440702e0228fc660.tar.zst nixlib-ad076ff7ce5ea04d7e890934440702e0228fc660.zip | |
git: 2.16.3 -> 2.17.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 | 8 |
1 files changed, 3 insertions, 5 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 9a484262b7b2..6b93d061a3be 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,22 +1,20 @@ diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt -index 8060ea35c..c81067a19 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt -@@ -203,8 +203,7 @@ a password is obtained using 'git-credential'. +@@ -208,8 +208,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 ++ 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 edcc6d346..8e357aeab 100755 --- a/git-send-email.perl +++ b/git-send-email.perl -@@ -885,8 +885,7 @@ if (defined $initial_reply_to) { +@@ -944,8 +944,7 @@ if (defined $reply_to) { } if (!defined $smtp_server) { |