[PATCH] Add t/t6003 with some --topo-order tests

diff --git a/object.c b/object.c
index c1f22910a2e207997fbc627ee8150a81b813c3b0..c410e97c8f378bd6c680efa48c82c3d3f7907103 100644 (file)
--- a/object.c
+++ b/object.c
@@ -4,14 +4,12 @@
 #include "commit.h"
 #include "cache.h"
 #include "tag.h"
-#include <stdlib.h>
-#include <string.h>
 
 struct object **objs;
 int nr_objs;
 static int obj_allocs;
 
-static int find_object(unsigned char *sha1)
+static int find_object(const unsigned char *sha1)
 {
        int first = 0, last = nr_objs;
 
@@ -32,7 +30,7 @@ static int find_object(unsigned char *sha1)
         return -first-1;
 }
 
-struct object *lookup_object(unsigned char *sha1)
+struct object *lookup_object(const unsigned char *sha1)
 {
        int pos = find_object(sha1);
        if (pos >= 0)
@@ -40,7 +38,7 @@ struct object *lookup_object(unsigned char *sha1)
        return NULL;
 }
 
-void created_object(unsigned char *sha1, struct object *obj)
+void created_object(const unsigned char *sha1, struct object *obj)
 {
        int pos = find_object(sha1);
 
@@ -99,39 +97,56 @@ void mark_reachable(struct object *obj, unsigned int mask)
        }
 }
 
-struct object *parse_object(unsigned char *sha1)
+struct object *lookup_object_type(const unsigned char *sha1, const char *type)
 {
-       unsigned long mapsize;
-       void *map = map_sha1_file(sha1, &mapsize);
-       if (map) {
-               char type[100];
-               unsigned long size;
-               void *buffer = unpack_sha1_file(map, mapsize, type, &size);
-               munmap(map, mapsize);
-               if (!buffer)
-                       return NULL;
+       if (!strcmp(type, blob_type)) {
+               return &lookup_blob(sha1)->object;
+       } else if (!strcmp(type, tree_type)) {
+               return &lookup_tree(sha1)->object;
+       } else if (!strcmp(type, commit_type)) {
+               return &lookup_commit(sha1)->object;
+       } else if (!strcmp(type, tag_type)) {
+               return &lookup_tag(sha1)->object;
+       } else {
+               error("Unknown type %s", type);
+               return NULL;
+       }
+}
+
+struct object *parse_object(const unsigned char *sha1)
+{
+       unsigned long size;
+       char type[20];
+       void *buffer = read_sha1_file(sha1, type, &size);
+       if (buffer) {
+               struct object *obj;
                if (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;
+                       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;
 }