Merge branch 'master' into next

diff --git a/object.c b/object.c
index cf5931a9423cb2ecdd9f34e6c33ed0b714ce61bf..9adc87479bde2a0b2a0a0335aed12a9f485facff 100644 (file)
--- a/object.c
+++ b/object.c
@@ -1,35 +1,39 @@
+#include "cache.h"
 #include "object.h"
 #include "blob.h"
 #include "tree.h"
 #include "commit.h"
-#include "cache.h"
 #include "tag.h"
 
 struct object **objs;
-int nr_objs;
-static int obj_allocs;
+static int nr_objs;
+int obj_allocs;
+
+int track_object_refs = 0;
 
-int track_object_refs = 1;
+static int hashtable_index(const unsigned char *sha1)
+{
+       unsigned int i;
+       memcpy(&i, sha1, sizeof(unsigned int));
+       return (int)(i % obj_allocs);
+}
 
 static int find_object(const unsigned char *sha1)
 {
-       int first = 0, last = nr_objs;
-
-        while (first < last) {
-                int next = (first + last) / 2;
-                struct object *obj = objs[next];
-                int cmp;
-
-                cmp = memcmp(sha1, obj->sha1, 20);
-                if (!cmp)
-                        return next;
-                if (cmp < 0) {
-                        last = next;
-                        continue;
-                }
-                first = next+1;
-        }
-        return -first-1;
+       int i;
+
+       if (!objs)
+               return -1;
+
+       i = hashtable_index(sha1);
+       while (objs[i]) {
+               if (memcmp(sha1, objs[i]->sha1, 20) == 0)
+                       return i;
+               i++;
+               if (i == obj_allocs)
+                       i = 0;
+       }
+       return -1 - i;
 }
 
 struct object *lookup_object(const unsigned char *sha1)
@@ -42,7 +46,7 @@ struct object *lookup_object(const unsigned char *sha1)
 
 void created_object(const unsigned char *sha1, struct object *obj)
 {
-       int pos = find_object(sha1);
+       int pos;
 
        obj->parsed = 0;
        memcpy(obj->sha1, sha1, 20);
@@ -50,18 +54,27 @@ void created_object(const unsigned char *sha1, struct object *obj)
        obj->refs = NULL;
        obj->used = 0;
 
-       if (pos >= 0)
-               die("Inserting %s twice\n", sha1_to_hex(sha1));
-       pos = -pos-1;
-
-       if (obj_allocs == nr_objs) {
-               obj_allocs = alloc_nr(obj_allocs);
+       if (obj_allocs - 1 <= nr_objs * 2) {
+               int i, count = obj_allocs;
+               obj_allocs = (obj_allocs < 32 ? 32 : 2 * obj_allocs);
                objs = xrealloc(objs, obj_allocs * sizeof(struct object *));
+               memset(objs + count, 0, (obj_allocs - count)
+                               * sizeof(struct object *));
+               for (i = 0; i < obj_allocs; i++)
+                       if (objs[i]) {
+                               int j = find_object(objs[i]->sha1);
+                               if (j != i) {
+                                       j = -1 - j;
+                                       objs[j] = objs[i];
+                                       objs[i] = NULL;
+                               }
+                       }
        }
 
-       /* Insert it into the right place */
-       memmove(objs + pos + 1, objs + pos, (nr_objs - pos) * 
-               sizeof(struct object *));
+       pos = find_object(sha1);
+       if (pos >= 0)
+               die("Inserting %s twice\n", sha1_to_hex(sha1));
+       pos = -pos-1;
 
        objs[pos] = obj;
        nr_objs++;
@@ -72,8 +85,7 @@ struct object_refs *alloc_object_refs(unsigned count)
        struct object_refs *refs;
        size_t size = sizeof(*refs) + count*sizeof(struct object *);
 
-       refs = xmalloc(size);
-       memset(refs, 0, size);
+       refs = xcalloc(1, size);
        refs->count = count;
        return refs;
 }
@@ -165,8 +177,7 @@ struct object *lookup_unknown_object(const unsigned char *sha1)
 {
        struct object *obj = lookup_object(sha1);
        if (!obj) {
-               union any_object *ret = xmalloc(sizeof(*ret));
-               memset(ret, 0, sizeof(*ret));
+               union any_object *ret = xcalloc(1, sizeof(*ret));
                created_object(sha1, &ret->object);
                ret->object.type = NULL;
                return &ret->object;
@@ -183,15 +194,18 @@ struct object *parse_object(const unsigned char *sha1)
                struct object *obj;
                if (check_sha1_signature(sha1, buffer, size, type) < 0)
                        printf("sha1 mismatch %s\n", sha1_to_hex(sha1));
-               if (!strcmp(type, "blob")) {
+               if (!strcmp(type, blob_type)) {
                        struct blob *blob = lookup_blob(sha1);
                        parse_blob_buffer(blob, buffer, size);
                        obj = &blob->object;
-               } else if (!strcmp(type, "tree")) {
+               } else if (!strcmp(type, tree_type)) {
                        struct tree *tree = lookup_tree(sha1);
-                       parse_tree_buffer(tree, buffer, size);
                        obj = &tree->object;
-               } else if (!strcmp(type, "commit")) {
+                       if (!tree->object.parsed) {
+                               parse_tree_buffer(tree, buffer, size);
+                               buffer = NULL;
+                       }
+               } else if (!strcmp(type, commit_type)) {
                        struct commit *commit = lookup_commit(sha1);
                        parse_commit_buffer(commit, buffer, size);
                        if (!commit->buffer) {
@@ -199,7 +213,7 @@ struct object *parse_object(const unsigned char *sha1)
                                buffer = NULL;
                        }
                        obj = &commit->object;
-               } else if (!strcmp(type, "tag")) {
+               } else if (!strcmp(type, tag_type)) {
                        struct tag *tag = lookup_tag(sha1);
                        parse_tag_buffer(tag, buffer, size);
                        obj = &tag->object;