##// END OF EJS Templates
nix: don't allow overriding the import packages. This causes overlays to fail
nix: don't allow overriding the import packages. This causes overlays to fail

File last commit:

r560:18084915 default
r571:c2f54fe4 default
Show More
ssh-path.patch
26 lines | 797 B | text/x-diff | DiffLexer
patches: organize into a single directory.
r560 diff --git a/connect.c b/connect.c
index c3a014c5b..fbca3262b 100644
--- a/connect.c
+++ b/connect.c
@@ -1010,7 +1010,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host,
ssh = getenv("GIT_SSH");
if (!ssh)
- ssh = "ssh";
+ ssh = "@ssh@";
variant = determine_ssh_variant(ssh, 0);
}
diff --git a/git-gui/lib/remote_add.tcl b/git-gui/lib/remote_add.tcl
index 480a6b30d..781720424 100644
--- a/git-gui/lib/remote_add.tcl
+++ b/git-gui/lib/remote_add.tcl
@@ -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)
}