[PATCH] ssh-push: Don't add '/' to pathname

Paths in the host:path notation are usually interpreted
relative to the login directory rather than relative to
the root directory.

Signed-off-by: Sven Verdoolaege <skimo@liacs.nl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/rsh.c b/rsh.c
index 8eea1d0233164a5d0d4977593538289dd93f722d..5615c74e7d5f4e5f9d93c0f90c6f57fe8b41442f 100644 (file)
--- a/rsh.c
+++ b/rsh.c
@@ -31,14 +31,15 @@ int setup_connection(int *fd_in, int *fd_out, const char *remote_prog,
        } else {
                host = url;
                path = strchr(host, ':');
        } else {
                host = url;
                path = strchr(host, ':');

+               if (path)
+                       *(path++) = '\0';

        }
        if (!path) {
                return error("Bad URL: %s", url);
        }
        }
        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, 
        snprintf(command, COMMAND_SIZE, 

-                "%s='/%s' %s",
+                "%s='%s' %s",

                 GIT_DIR_ENVIRONMENT, path, remote_prog);
        posn = command + strlen(command);
        for (i = 0; i < rmt_argc; i++) {
                 GIT_DIR_ENVIRONMENT, path, remote_prog);
        posn = command + strlen(command);
        for (i = 0; i < rmt_argc; i++) {