# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2018-05-09 09:57:01
# Node ID d0072f26031157e027cf5b7842245d0d655c8251
# Parent  92b33b734c8a62a3e0f1875ce2b0a16b5e38cfa7

git: bumped version to 2.16.3

diff --git a/default.nix b/default.nix
--- a/default.nix
+++ b/default.nix
@@ -16,10 +16,10 @@ let
   pkgs = pkgs_.overridePackages (self: super: {
     # bump GIT version
     git = pkgs.lib.overrideDerivation pkgs_.git (oldAttrs: {
-      name = "git-2.13.5";
+      name = "git-2.16.3";
       src = pkgs.fetchurl {
-        url = "https://www.kernel.org/pub/software/scm/git/git-2.13.5.tar.xz";
-        sha256 = "18fi18103n7grshm4ffb0fwsnvbl48sbqy5gqx528vf8maff5j91";
+        url = "https://www.kernel.org/pub/software/scm/git/git-2.16.3.tar.xz";
+        sha256 = "0j1dwvg5llnj3g0fp8hdgpms4hp90qw9f6509vqw30dhwplrjpfn";
       };
 
       patches = [
diff --git a/pkgs/git_patches/git-sh-i18n.patch b/pkgs/git_patches/git-sh-i18n.patch
--- a/pkgs/git_patches/git-sh-i18n.patch
+++ b/pkgs/git_patches/git-sh-i18n.patch
@@ -6,15 +6,15 @@
 
 -# First decide what scheme to use...
 -GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
--if test -n "@@USE_GETTEXT_SCHEME@@"
+-if test -n "$GIT_GETTEXT_POISON"
+-then
+-	GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
+-elif test -n "@@USE_GETTEXT_SCHEME@@"
 -then
 -	GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@"
 -elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
 -then
 -	: no probing necessary
--elif test -n "$GIT_GETTEXT_POISON"
--then
--	GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
 -elif type gettext.sh >/dev/null 2>&1
 -then
 -	# GNU libintl's gettext.sh
diff --git a/pkgs/git_patches/ssh-path.patch b/pkgs/git_patches/ssh-path.patch
--- a/pkgs/git_patches/ssh-path.patch
+++ b/pkgs/git_patches/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@";
-				else
-					handle_ssh_variant(ssh, 0,
-								&port_option,
+ 		ssh = getenv("GIT_SSH");
+ 		if (!ssh)
+-			ssh = "ssh";
++			ssh = "@ssh@";
+ 		variant = determine_ssh_variant(ssh, 0);
+ 	}
+
 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]} {