sunshine: 2025.118.151840 -> 2025.122.141614 (#376248)
[NixPkgs.git] / pkgs / applications / version-management / git / ssh-path.patch
blob71cdc694ac31592dfee0517224906661b95e87b9
1 diff --git a/connect.c b/connect.c
2 index 4813f005ab..b3f12f3268 100644
3 --- a/connect.c
4 +++ b/connect.c
5 @@ -1183,7 +1183,7 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host,
7 ssh = getenv("GIT_SSH");
8 if (!ssh)
9 - ssh = "ssh";
10 + ssh = "@ssh@";
11 variant = determine_ssh_variant(ssh, 0);
14 diff --git a/git-gui/lib/remote_add.tcl b/git-gui/lib/remote_add.tcl
15 index 480a6b30d0..7817204241 100644
16 --- a/git-gui/lib/remote_add.tcl
17 +++ b/git-gui/lib/remote_add.tcl
18 @@ -139,7 +139,7 @@ method _add {} {
19 # Parse the location
20 if { [regexp {(?:git\+)?ssh://([^/]+)(/.+)} $location xx host path]
21 || [regexp {([^:][^:]+):(.+)} $location xx host path]} {
22 - set ssh ssh
23 + set ssh @ssh@
24 if {[info exists env(GIT_SSH)]} {
25 set ssh $env(GIT_SSH)