From b5be5ef364b031df7f51babd8c15e5bd0b6fa286 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 18 Jan 2018 09:13:17 -0500 Subject: [PATCH] git: 2.15.1 -> 2.16.0 --- .../git-and-tools/git/default.nix | 4 +- .../git/git-send-email-honor-PATH.patch | 45 ++++++------------- .../git-and-tools/git/ssh-path.patch | 22 ++++----- 3 files changed, 26 insertions(+), 45 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 3a258543330..725f180bf8a 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -13,7 +13,7 @@ }: let - version = "2.15.1"; + version = "2.16.0"; svn = subversionClient.override { perlBindings = true; }; in @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0p04linqdywdf7m1hqa904fzqvgzplsxlzdqrn96j1j5gpyr174r"; + sha256 = "1y1hdr8ydff5q7y762cwfdgaxam4mxvir6nrw3g51mmkcr77c40d"; }; hardeningDisable = [ "format" ]; 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 1aec77504b7..9a484262b7b 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 -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 ---- - 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=:: - 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 - diff --git a/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch b/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch index 5e24c19f0fe..addb1dbc5e0 100644 --- a/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch +++ b/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch @@ -1,21 +1,21 @@ diff --git a/connect.c b/connect.c -index fd7ffe1..20cd992 100644 +index c3a014c5b..fbca3262b 100644 --- a/connect.c +++ b/connect.c -@@ -768,7 +768,7 @@ +@@ -1010,7 +1010,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host, + + ssh = getenv("GIT_SSH"); + if (!ssh) +- ssh = "ssh"; ++ ssh = "@ssh@"; + variant = determine_ssh_variant(ssh, 0); + } - ssh = getenv("GIT_SSH"); - if (!ssh) -- ssh = "ssh"; -+ ssh = "@ssh@"; - else - handle_ssh_variant(ssh, 0, - &port_option, diff --git a/git-gui/lib/remote_add.tcl b/git-gui/lib/remote_add.tcl -index 50029d0..17b9594 100644 +index 480a6b30d..781720424 100644 --- a/git-gui/lib/remote_add.tcl +++ b/git-gui/lib/remote_add.tcl -@@ -139,7 +139,7 @@ +@@ -139,7 +139,7 @@ method _add {} { # Parse the location if { [regexp {(?:git\+)?ssh://([^/]+)(/.+)} $location xx host path] || [regexp {([^:][^:]+):(.+)} $location xx host path]} {