[PATCH] git-commit-script fix for degenerated merge

diff --git a/rsh.c b/rsh.c
index 8eea1d0233164a5d0d4977593538289dd93f722d..fe87e581d21d0465da9e3fadef0454c69640caa7 100644 (file)
--- a/rsh.c
+++ b/rsh.c
@@ -31,15 +31,17 @@ int setup_connection(int *fd_in, int *fd_out, const char *remote_prog,
        } else {
                host = url;
                path = strchr(host, ':');
+               if (path)
+                       *(path++) = '\0';
        }
        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, 
-                "%s='/%s' %s",
+                "%s='%s' %s",
                 GIT_DIR_ENVIRONMENT, path, remote_prog);
+       *path = '\0';
        posn = command + strlen(command);
        for (i = 0; i < rmt_argc; i++) {
                *(posn++) = ' ';