nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-26 10:30:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

(git): fix ssh-path patch which was broken during the update to 2.14.1

Browse Source
This commit is contained in:
Amine Chikhaoui
2017-08-11 11:04:50 +01:00
committed by Robin Gloster
parent 6932d806ce
commit 0fb781e8d7
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,18 +1,18 @@
diff --git a/connect.c b/connect.c
index fd7ffe1..20cd992 100644
index 49b28b83b..fad9047b5 100644
--- a/connect.c
+++ b/connect.c
@@ -768,7 +768,7 @@ struct child_process *git_connect(int fd[2], const char *url,
@@ -882,7 +882,7 @@ struct child_process *git_connect(int fd[2], const char *url,
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
index 480a6b30d..781720424 100644
--- a/git-gui/lib/remote_add.tcl
+++ b/git-gui/lib/remote_add.tcl
@@ -139,7 +139,7 @@ method _add {} {