[PATCH] Adjust git-merge-recursive.py for the new tool names.

diff --git a/rsh.c b/rsh.c
index fe87e581d21d0465da9e3fadef0454c69640caa7..04cbdf7a67e9f26d024da1117bf5a5a03596dd1b 100644 (file)
--- a/rsh.c
+++ b/rsh.c
@@ -56,10 +56,18 @@ int setup_connection(int *fd_in, int *fd_out, const char *remote_prog,
                return error("Couldn't create socket");
        }
        if (!fork()) {
+               const char *ssh, *ssh_basename;
+               ssh = getenv("GIT_SSH");
+               if (!ssh) ssh = "ssh";
+               ssh_basename = strrchr(ssh, '/');
+               if (!ssh_basename)
+                       ssh_basename = ssh;
+               else
+                       ssh_basename++;
                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];