git-tar-tree: no more void pointer arithmetic

[git.git] / ssh-fetch.c

diff --git a/ssh-fetch.c b/ssh-fetch.c
index d8f4368..e3067b8 100644 (file)
--- a/ssh-fetch.c
+++ b/ssh-fetch.c
@@ -1,3 +1,13 @@
+#ifndef COUNTERPART_ENV_NAME
+#define COUNTERPART_ENV_NAME "GIT_SSH_UPLOAD"
+#endif
+#ifndef COUNTERPART_PROGRAM_NAME
+#define COUNTERPART_PROGRAM_NAME "git-ssh-upload"
+#endif
+#ifndef MY_PROGRAM_NAME
+#define MY_PROGRAM_NAME "git-ssh-fetch"
+#endif
+
 #include "cache.h"
 #include "commit.h"
 #include "rsh.h"
@@ -26,12 +36,26 @@ static ssize_t force_write(int fd, void *buffer, size_t length)
        return ret;
 }
 
+static int prefetches = 0;
+
+static struct object_list *in_transit = NULL;
+static struct object_list **end_of_transit = &in_transit;
+
 void prefetch(unsigned char *sha1)
 {
        char type = 'o';
+       struct object_list *node;
+       if (prefetches > 100) {
+               fetch(in_transit->item->sha1);
+       }
+       node = xmalloc(sizeof(struct object_list));
+       node->next = NULL;
+       node->item = lookup_unknown_object(sha1);
+       *end_of_transit = node;
+       end_of_transit = &node->next;
        force_write(fd_out, &type, 1);
        force_write(fd_out, sha1, 20);
-       //memcpy(requested + 20 * prefetches++, sha1, 20);
+       prefetches++;
 }
 
 static char conn_buf[4096];
@@ -41,6 +65,18 @@ int fetch(unsigned char *sha1)
 {
        int ret;
        signed char remote;
+       struct object_list *temp;
+
+       if (memcmp(sha1, in_transit->item->sha1, 20)) {
+               // we must have already fetched it to clean the queue
+               return has_sha1_file(sha1) ? 0 : -1;
+       }
+       prefetches--;
+       temp = in_transit;
+       in_transit = in_transit->next;
+       if (!in_transit)
+               end_of_transit = &in_transit;
+       free(temp);
 
        if (conn_buf_posn) {
                remote = conn_buf[0];
@@ -82,6 +118,9 @@ int fetch_ref(char *ref, unsigned char *sha1)
        return 0;
 }
 
+static const char ssh_fetch_usage[] =
+  MY_PROGRAM_NAME
+  " [-c] [-t] [-a] [-v] [-d] [--recover] [-w ref] commit-id url";
 int main(int argc, char **argv)
 {
        char *commit_id;
@@ -92,6 +131,9 @@ int main(int argc, char **argv)
        prog = getenv("GIT_SSH_PUSH");
        if (!prog) prog = "git-ssh-upload";
 
+       setup_git_directory();
+       git_config(git_default_config);
+
        while (arg < argc && argv[arg][0] == '-') {
                if (argv[arg][1] == 't') {
                        get_tree = 1;
@@ -106,15 +148,18 @@ int main(int argc, char **argv)
                } else if (argv[arg][1] == 'w') {
                        write_ref = argv[arg + 1];
                        arg++;
+               } else if (!strcmp(argv[arg], "--recover")) {
+                       get_recover = 1;
                }
                arg++;
        }
        if (argc < arg + 2) {
-               usage("git-ssh-fetch [-c] [-t] [-a] [-v] [-d] [--recover] [-w ref] commit-id url");
+               usage(ssh_fetch_usage);
                return 1;
        }
        commit_id = argv[arg];
        url = argv[arg + 1];
+       write_ref_log_details = url;
 
        if (setup_connection(&fd_in, &fd_out, prog, url, arg, argv + 1))
                return 1;