public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git: revert "2.16.2 -> 2.17.0"

Browse Source 
This reverts commit 5d65b4ebeb, because it broke
git-add. See https://github.com/NixOS/nixpkgs/pull/38636#issuecomment-380182555
for details.
This commit is contained in:
Peter Simons
2018-04-11 09:51:06 +02:00
parent 4ee2ac646e
commit e4fd05449e
5 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch
+5 -3
View File
@@ -1,20 +1,22 @@
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
@@ -208,8 +208,7 @@ 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 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
@@ -944,8 +944,7 @@ if (defined $reply_to) {
@@ -885,8 +885,7 @@ if (defined $initial_reply_to) {
}
if (!defined $smtp_server) {