[PATCH] Update tags to record who made them

[git.git] / ssh-pull.c

diff --git a/ssh-pull.c b/ssh-pull.c
index 3556d89..26356dd 100644 (file)
--- a/ssh-pull.c
+++ b/ssh-pull.c
@@ -2,6 +2,7 @@
 #include "commit.h"
 #include "rsh.h"
 #include "pull.h"
+#include "refs.h"
 
 static int fd_in;
 static int fd_out;
@@ -28,7 +29,7 @@ int fetch(unsigned char *sha1)
        return ret;
 }
 
-int get_version(void)
+static int get_version(void)
 {
        char type = 'v';
        write(fd_out, &type, 1);
@@ -39,38 +40,51 @@ int get_version(void)
        return 0;
 }
 
+int fetch_ref(char *ref, unsigned char *sha1)
+{
+       signed char remote;
+       char type = 'r';
+       write(fd_out, &type, 1);
+       write(fd_out, ref, strlen(ref) + 1);
+       read(fd_in, &remote, 1);
+       if (remote < 0)
+               return remote;
+       read(fd_in, sha1, 20);
+       return 0;
+}
+
 int main(int argc, char **argv)
 {
        char *commit_id;
        char *url;
        int arg = 1;
+       const char *prog = getenv("GIT_SSH_PUSH") ? : "git-ssh-push";
 
        while (arg < argc && argv[arg][0] == '-') {
                if (argv[arg][1] == 't') {
                        get_tree = 1;
                } else if (argv[arg][1] == 'c') {
                        get_history = 1;
-               } else if (argv[arg][1] == 'd') {
-                       get_delta = 0;
-               } else if (!strcmp(argv[arg], "--recover")) {
-                       get_delta = 2;
                } else if (argv[arg][1] == 'a') {
                        get_all = 1;
                        get_tree = 1;
                        get_history = 1;
                } else if (argv[arg][1] == 'v') {
                        get_verbosely = 1;
+               } else if (argv[arg][1] == 'w') {
+                       write_ref = argv[arg + 1];
+                       arg++;
                }
                arg++;
        }
        if (argc < arg + 2) {
-               usage("git-ssh-pull [-c] [-t] [-a] [-v] [-d] [--recover] commit-id url");
+               usage("git-ssh-pull [-c] [-t] [-a] [-v] [-d] [--recover] [-w ref] commit-id url");
                return 1;
        }
        commit_id = argv[arg];
        url = argv[arg + 1];
 
-       if (setup_connection(&fd_in, &fd_out, "git-ssh-push", url, arg, argv + 1))
+       if (setup_connection(&fd_in, &fd_out, prog, url, arg, argv + 1))
                return 1;
 
        if (get_version())