ssh-path.patch
26 lines
| 797 B
| text/x-diff
|
DiffLexer
r272 | diff --git a/connect.c b/connect.c | |||
r433 | index c3a014c5b..fbca3262b 100644 | |||
r272 | --- a/connect.c | |||
+++ b/connect.c | ||||
r433 | @@ -1010,7 +1010,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host, | |||
r272 | ||||
r433 | ssh = getenv("GIT_SSH"); | |||
if (!ssh) | ||||
- ssh = "ssh"; | ||||
+ ssh = "@ssh@"; | ||||
variant = determine_ssh_variant(ssh, 0); | ||||
} | ||||
r272 | diff --git a/git-gui/lib/remote_add.tcl b/git-gui/lib/remote_add.tcl | |||
r433 | index 480a6b30d..781720424 100644 | |||
r272 | --- a/git-gui/lib/remote_add.tcl | |||
+++ b/git-gui/lib/remote_add.tcl | ||||
r433 | @@ -139,7 +139,7 @@ method _add {} { | |||
r272 | # 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) | ||||
} | ||||