Support :ext: access method.

[git.git] / ssh-push.c

diff --git a/ssh-push.c b/ssh-push.c
index b67a95b..db69c88 100644 (file)
--- a/ssh-push.c
+++ b/ssh-push.c
@@ -2,13 +2,15 @@
 #include "rsh.h"
 #include "refs.h"
 
+#include <string.h>
+
 unsigned char local_version = 1;
 unsigned char remote_version = 0;
 
 int serve_object(int fd_in, int fd_out) {
        ssize_t size;
        int posn = 0;
-       char sha1[20];
+       unsigned char sha1[20];
        unsigned long objsize;
        void *buf;
        signed char remote;
@@ -103,24 +105,34 @@ void service(int fd_in, int fd_out) {
        } while (1);
 }
 
+static const char *ssh_push_usage =
+       "git-ssh-push [-c] [-t] [-a] [-w ref] commit-id url";
+
 int main(int argc, char **argv)
 {
        int arg = 1;
         char *commit_id;
         char *url;
        int fd_in, fd_out;
+       const char *prog = getenv("GIT_SSH_PULL") ? : "git-ssh-pull";
+       unsigned char sha1[20];
+       char hex[41];
+
        while (arg < argc && argv[arg][0] == '-') {
                if (argv[arg][1] == 'w')
                        arg++;
                 arg++;
         }
-        if (argc < arg + 2) {
-               usage("git-ssh-push [-c] [-t] [-a] [-w ref] commit-id url");
-                return 1;
-        }
+       if (argc < arg + 2)
+               usage(ssh_push_usage);
        commit_id = argv[arg];
        url = argv[arg + 1];
-       if (setup_connection(&fd_in, &fd_out, "git-ssh-pull", url, arg, argv + 1))
+       if (get_sha1(commit_id, sha1))
+               usage(ssh_push_usage);
+       memcpy(hex, sha1_to_hex(sha1), sizeof(hex));
+       argv[arg] = hex;
+
+       if (setup_connection(&fd_in, &fd_out, prog, url, arg, argv + 1))
                return 1;
 
        service(fd_in, fd_out);