[PATCH] -w support for git-ssh-pull/push

diff --git a/object.c b/object.c
index c1f22910a2e207997fbc627ee8150a81b813c3b0..5e72a7878488922cfeeb5dba385d72049253f7c3 100644 (file)
--- a/object.c
+++ b/object.c
@@ -4,8 +4,7 @@
 #include "commit.h"
 #include "cache.h"
 #include "tag.h"
-#include <stdlib.h>
-#include <string.h>
+#include "delta.h"
 
 struct object **objs;
 int nr_objs;
@@ -104,34 +103,46 @@ struct object *parse_object(unsigned char *sha1)
        unsigned long mapsize;
        void *map = map_sha1_file(sha1, &mapsize);
        if (map) {
+               int is_delta;
+               struct object *obj;
                char type[100];
                unsigned long size;
                void *buffer = unpack_sha1_file(map, mapsize, type, &size);
                munmap(map, mapsize);
                if (!buffer)
                        return NULL;
-               if (check_sha1_signature(sha1, buffer, size, type) < 0)
+               is_delta = !strcmp(type, "delta");
+               if (!is_delta && check_sha1_signature(sha1, buffer, size, type) < 0)
                        printf("sha1 mismatch %s\n", sha1_to_hex(sha1));
-               free(buffer);
-               if (!strcmp(type, "blob")) {
-                       struct blob *ret = lookup_blob(sha1);
-                       parse_blob(ret);
-                       return &ret->object;
+               if (is_delta) {
+                       struct delta *delta = lookup_delta(sha1);
+                       parse_delta_buffer(delta, buffer, size);
+                       obj = (struct object *) delta;
+               } else if (!strcmp(type, "blob")) {
+                       struct blob *blob = lookup_blob(sha1);
+                       parse_blob_buffer(blob, buffer, size);
+                       obj = &blob->object;
                } else if (!strcmp(type, "tree")) {
-                       struct tree *ret = lookup_tree(sha1);
-                       parse_tree(ret);
-                       return &ret->object;
+                       struct tree *tree = lookup_tree(sha1);
+                       parse_tree_buffer(tree, buffer, size);
+                       obj = &tree->object;
                } else if (!strcmp(type, "commit")) {
-                       struct commit *ret = lookup_commit(sha1);
-                       parse_commit(ret);
-                       return &ret->object;
+                       struct commit *commit = lookup_commit(sha1);
+                       parse_commit_buffer(commit, buffer, size);
+                       if (!commit->buffer) {
+                               commit->buffer = buffer;
+                               buffer = NULL;
+                       }
+                       obj = &commit->object;
                } else if (!strcmp(type, "tag")) {
-                       struct tag *ret = lookup_tag(sha1);
-                       parse_tag(ret);
-                       return &ret->object;
+                       struct tag *tag = lookup_tag(sha1);
+                       parse_tag_buffer(tag, buffer, size);
+                       obj = &tag->object;
                } else {
-                       return NULL;
+                       obj = NULL;
                }
+               free(buffer);
+               return obj;
        }
        return NULL;
 }