Use GIT_SSH environment to specify alternate ssh binary.

[jc: I ended up rewriting Martin's patch due to whitespace
breakage, but the credit goes to Martin for doing the initial
patch to identify what needs to be changed.]

Signed-off-by: Martin Sivak <mars@nomi.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/connect.c b/connect.c
index 8f4d99aef25d66c6c8f0196055dd7df8ecd6ef2d..a6657b13848b5474ffde7edb0ad60ed969f22852 100644 (file)
--- a/connect.c
+++ b/connect.c
@@ -382,8 +382,15 @@ int git_connect(int fd[2], char *url, const char *prog)
                close(pipefd[0][1]);
                close(pipefd[1][0]);
                close(pipefd[1][1]);
                close(pipefd[0][1]);
                close(pipefd[1][0]);
                close(pipefd[1][1]);

-               if (protocol == PROTO_SSH)
-                       execlp("ssh", "ssh", host, command, NULL);
+               if (protocol == PROTO_SSH) {
+                       const char *ssh = getenv("GIT_SSH") ? : "ssh";
+                       const char *ssh_basename = strrchr(ssh, '/');
+                       if (!ssh_basename)
+                               ssh_basename = ssh;
+                       else
+                               ssh_basename++;
+                       execlp(ssh, ssh_basename, host, command, NULL);
+               }

                else
                        execlp("sh", "sh", "-c", command, NULL);
                die("exec failed");
                else
                        execlp("sh", "sh", "-c", command, NULL);
                die("exec failed");

diff --git a/rsh.c b/rsh.c
index fe87e581d21d0465da9e3fadef0454c69640caa7..bcb1c80d84b77e04bf843c2b38592284760ae165 100644 (file)
--- a/rsh.c
+++ b/rsh.c
@@ -56,10 +56,16 @@ int setup_connection(int *fd_in, int *fd_out, const char *remote_prog,
                return error("Couldn't create socket");
        }
        if (!fork()) {
                return error("Couldn't create socket");
        }
        if (!fork()) {

+               const char *ssh = getenv("GIT_SSH") ? : "ssh";
+               const char *ssh_basename = strrchr(ssh, '/');
+               if (!ssh_basename)
+                       ssh_basename = ssh;
+               else
+                       ssh_basename++;

                close(sv[1]);
                dup2(sv[0], 0);
                dup2(sv[0], 1);
                close(sv[1]);
                dup2(sv[0], 0);
                dup2(sv[0], 1);

-               execlp("ssh", "ssh", host, command, NULL);
+               execlp(ssh, ssh_basename, host, command, NULL);

        }
        close(sv[0]);
        *fd_in = sv[1];
        }
        close(sv[0]);
        *fd_in = sv[1];