mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-24 22:53:42 +00:00
d994dabace
We do not use a "plugin system" for Git addons anymore, and therefore this directory is no longer useful. Indeed that directory is way more confusing, given that it includes more than mere Git addons, going from Bitbucket server command-line tools to complete rewrites of Git in exotic programming languages. Also, without this directory, the mental load of decision-making reduces a lot. When anyone is interested in including a new git-related tool, just put it into pkgs/applications/version-management, without apologies.
27 lines
803 B
Diff
27 lines
803 B
Diff
diff --git a/connect.c b/connect.c
|
|
index 4813f005ab..b3f12f3268 100644
|
|
--- a/connect.c
|
|
+++ b/connect.c
|
|
@@ -1183,7 +1183,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 480a6b30d0..7817204241 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)
|
|
}
|