nixpkgs/pkgs/applications/version-management/git-and-tools/git/ssh-path.patch

27 lines
803 B
Diff
Raw Normal View History

diff --git a/connect.c b/connect.c
2019-02-25 18:26:30 +00:00
index 4813f005ab..b3f12f3268 100644
--- a/connect.c
+++ b/connect.c
2019-02-25 18:26:30 +00:00
@@ -1183,7 +1183,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host,
2018-01-18 14:13:17 +00:00
ssh = getenv("GIT_SSH");
if (!ssh)
- ssh = "ssh";
+ ssh = "@ssh@";
variant = determine_ssh_variant(ssh, 0);
}
2019-02-25 18:26:30 +00:00
diff --git a/git-gui/lib/remote_add.tcl b/git-gui/lib/remote_add.tcl
2019-02-25 18:26:30 +00:00
index 480a6b30d0..7817204241 100644
--- a/git-gui/lib/remote_add.tcl
+++ b/git-gui/lib/remote_add.tcl
2018-01-18 14:13:17 +00:00
@@ -139,7 +139,7 @@ method _add {} {
# Parse the location
if { [regexp {(?:git\+)?ssh://([^/]+)(/.+)} $location xx host path]
|| [regexp {([^:][^:]+):(.+)} $location xx host path]} {
- set ssh ssh
+ set ssh @ssh@
if {[info exists env(GIT_SSH)]} {
set ssh $env(GIT_SSH)
}