diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2017-05-09 21:57:24 -0400 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2017-05-09 21:57:24 -0400 |
| commit | ce8662e693b5756e8457d94bb1765d853310afdb (patch) | |
| tree | 3be7de792361a625a63f6d40875d45021414ce1d /pkgs/applications/version-management | |
| parent | f2e100ca85994c6edab06d3b4aba612a8f7eba4c (diff) | |
| download | nixlib-ce8662e693b5756e8457d94bb1765d853310afdb.tar nixlib-ce8662e693b5756e8457d94bb1765d853310afdb.tar.gz nixlib-ce8662e693b5756e8457d94bb1765d853310afdb.tar.bz2 nixlib-ce8662e693b5756e8457d94bb1765d853310afdb.tar.lz nixlib-ce8662e693b5756e8457d94bb1765d853310afdb.tar.xz nixlib-ce8662e693b5756e8457d94bb1765d853310afdb.tar.zst nixlib-ce8662e693b5756e8457d94bb1765d853310afdb.zip | |
git: 2.12.2 -> 2.13.0
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/ssh-path.patch | 12 |
2 files changed, 8 insertions, 8 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 e1e01c1ed287..eccd869ba564 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -11,7 +11,7 @@ }: let - version = "2.12.2"; + version = "2.13.0"; svn = subversionClient.override { perlBindings = true; }; in @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0jlccxx7l4c76h830y8lhrxr4kqksrxqlnmj3xb8sqbfa0irw6nj"; + sha256 = "0n0j36rapw31zb0sabap88ffncv8jg3nwc4miyim64ilyav2mgsb"; }; hardeningDisable = [ "format" ]; 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 26db3d810823..5e24c19f0fee 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 @@ -2,20 +2,20 @@ diff --git a/connect.c b/connect.c index fd7ffe1..20cd992 100644 --- a/connect.c +++ b/connect.c -@@ -768,7 +768,7 @@ struct child_process *git_connect(int fd[2], const char *url, - +@@ -768,7 +768,7 @@ + ssh = getenv("GIT_SSH"); if (!ssh) - ssh = "ssh"; + ssh = "@ssh@"; - - ssh_dup = xstrdup(ssh); - base = basename(ssh_dup); + 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 --- a/git-gui/lib/remote_add.tcl +++ b/git-gui/lib/remote_add.tcl -@@ -139,7 +139,7 @@ method _add {} { +@@ -139,7 +139,7 @@ # Parse the location if { [regexp {(?:git\+)?ssh://([^/]+)(/.+)} $location xx host path] || [regexp {([^:][^:]+):(.+)} $location xx host path]} { |