[PATCH] Fixed/Extended example for update hook

diff --git a/rsh.c b/rsh.c
index 2a52e598164b565fcb06e452d6fb9866344e4c12..bcb1c80d84b77e04bf843c2b38592284760ae165 100644 (file)
--- a/rsh.c
+++ b/rsh.c
@@ -8,7 +8,7 @@
 
 #define COMMAND_SIZE 4096
 
-int setup_connection(int *fd_in, int *fd_out, char *remote_prog, 
+int setup_connection(int *fd_in, int *fd_out, const char *remote_prog, 
                     char *url, int rmt_argc, char **rmt_argv)
 {
        char *host;
@@ -25,19 +25,23 @@ int setup_connection(int *fd_in, int *fd_out, char *remote_prog,
        }
 
        host = strstr(url, "//");
-       if (!host) {
-               return error("Bad URL: %s", url);
+       if (host) {
+               host += 2;
+               path = strchr(host, '/');
+       } else {
+               host = url;
+               path = strchr(host, ':');
+               if (path)
+                       *(path++) = '\0';
        }
-       host += 2;
-       path = strchr(host, '/');
        if (!path) {
                return error("Bad URL: %s", url);
        }
-       *(path++) = '\0';
-       /* ssh <host> 'cd /<path>; stdio-pull <arg...> <commit-id>' */
+       /* ssh <host> 'cd <path>; stdio-pull <arg...> <commit-id>' */
        snprintf(command, COMMAND_SIZE, 
-                "cd /%s; SHA1_FILE_DIRECTORY=objects %s",
-                path, remote_prog);
+                "%s='%s' %s",
+                GIT_DIR_ENVIRONMENT, path, remote_prog);
+       *path = '\0';
        posn = command + strlen(command);
        for (i = 0; i < rmt_argc; i++) {
                *(posn++) = ' ';
@@ -52,10 +56,16 @@ int setup_connection(int *fd_in, int *fd_out, char *remote_prog,
                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);
-               execlp("ssh", "ssh", host, command, NULL);
+               execlp(ssh, ssh_basename, host, command, NULL);
        }
        close(sv[0]);
        *fd_in = sv[1];