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

git: 2.12.2 -> 2.13.0

Browse Source
This commit is contained in:
Tim Steinbach 2017-05-09 21:57:24 -04:00
parent f2e100ca85
commit ce8662e693
No known key found for this signature in database
GPG Key ID: 472BFCCA96BD0EDA
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -11,7 +11,7 @@
}: }:
let let
version = "2.12.2"; version = "2.13.0";
svn = subversionClient.override { perlBindings = true; }; svn = subversionClient.override { perlBindings = true; };
in in
@ -20,7 +20,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
sha256 = "0jlccxx7l4c76h830y8lhrxr4kqksrxqlnmj3xb8sqbfa0irw6nj"; sha256 = "0n0j36rapw31zb0sabap88ffncv8jg3nwc4miyim64ilyav2mgsb";
}; };
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

10
pkgs/applications/version-management/git-and-tools/git/ssh-path.patch
View File

@ -2,20 +2,20 @@ diff --git a/connect.c b/connect.c
index fd7ffe1..20cd992 100644 index fd7ffe1..20cd992 100644
--- a/connect.c --- a/connect.c
+++ b/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"); ssh = getenv("GIT_SSH");
if (!ssh) if (!ssh)
- ssh = "ssh"; - ssh = "ssh";
+ ssh = "@ssh@"; + ssh = "@ssh@";
else
ssh_dup = xstrdup(ssh); handle_ssh_variant(ssh, 0,
base = basename(ssh_dup); &port_option,
diff --git a/git-gui/lib/remote_add.tcl b/git-gui/lib/remote_add.tcl diff --git a/git-gui/lib/remote_add.tcl b/git-gui/lib/remote_add.tcl
index 50029d0..17b9594 100644 index 50029d0..17b9594 100644
--- a/git-gui/lib/remote_add.tcl --- a/git-gui/lib/remote_add.tcl
+++ b/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 # Parse the location
if { [regexp {(?:git\+)?ssh://([^/]+)(/.+)} $location xx host path] if { [regexp {(?:git\+)?ssh://([^/]+)(/.+)} $location xx host path]
|| [regexp {([^:][^:]+):(.+)} $location xx host path]} { || [regexp {([^:][^:]+):(.+)} $location xx host path]} {