Merge with http://members.cox.net/junkio/git-jc.git

[git.git] / rsh.c

diff --git a/rsh.c b/rsh.c
index af2f47b..5d1cb9d 100644 (file)
--- a/rsh.c
+++ b/rsh.c
@@ -36,8 +36,8 @@ int setup_connection(int *fd_in, int *fd_out, char *remote_prog,
        *(path++) = '\0';
        /* ssh <host> 'cd /<path>; stdio-pull <arg...> <commit-id>' */
        snprintf(command, COMMAND_SIZE, 
-                "cd /%s; SHA1_FILE_DIRECTORY=objects %s",
-                path, remote_prog);
+                "cd /%s; %s=objects %s",
+                path, DB_ENVIRONMENT, remote_prog);
        posn = command + strlen(command);
        for (i = 0; i < rmt_argc; i++) {
                *(posn++) = ' ';
@@ -48,7 +48,7 @@ int setup_connection(int *fd_in, int *fd_out, char *remote_prog,
                }
        }
        strcpy(posn, " -");
-       if (socketpair(AF_LOCAL, SOCK_STREAM, 0, sv)) {
+       if (socketpair(AF_UNIX, SOCK_STREAM, 0, sv)) {
                return error("Couldn't create socket");
        }
        if (!fork()) {