t/t5528-push-default: generalize test_push_*

diff --git a/object.c b/object.c
index 10b534946126f7d7e640f9634ebd2991373eae32..cbc7333a7ec083556ba9b46e1adafb695f83e0af 100644 (file)
--- a/object.c
+++ b/object.c
@@ -71,13 +71,13 @@ static unsigned int hashtable_index(const unsigned char *sha1)
 
 struct object *lookup_object(const unsigned char *sha1)
 {
-       unsigned int i;
+       unsigned int i, first;
        struct object *obj;
 
        if (!obj_hash)
                return NULL;
 
-       i = hashtable_index(sha1);
+       first = i = hashtable_index(sha1);
        while ((obj = obj_hash[i]) != NULL) {
                if (!hashcmp(sha1, obj->sha1))
                        break;
@@ -85,6 +85,16 @@ struct object *lookup_object(const unsigned char *sha1)
                if (i == obj_hash_size)
                        i = 0;
        }
+       if (obj && i != first) {
+               /*
+                * Move object to where we started to look for it so
+                * that we do not need to walk the hash table the next
+                * time we look for it.
+                */
+               struct object *tmp = obj_hash[i];
+               obj_hash[i] = obj_hash[first];
+               obj_hash[first] = tmp;
+       }
        return obj;
 }
 
@@ -260,11 +270,18 @@ void add_object_array(struct object *obj, const char *name, struct object_array
        add_object_array_with_mode(obj, name, array, S_IFINVALID);
 }
 
+/*
+ * A zero-length string to which object_array_entry::name can be
+ * initialized without requiring a malloc/free.
+ */
+static char object_array_slopbuf[1];
+
 void add_object_array_with_mode(struct object *obj, const char *name, struct object_array *array, unsigned mode)
 {
        unsigned nr = array->nr;
        unsigned alloc = array->alloc;
        struct object_array_entry *objects = array->objects;
+       struct object_array_entry *entry;
 
        if (nr >= alloc) {
                alloc = (alloc + 32) * 2;
@@ -272,9 +289,16 @@ void add_object_array_with_mode(struct object *obj, const char *name, struct obj
                array->alloc = alloc;
                array->objects = objects;
        }
-       objects[nr].item = obj;
-       objects[nr].name = name;
-       objects[nr].mode = mode;
+       entry = &objects[nr];
+       entry->item = obj;
+       if (!name)
+               entry->name = NULL;
+       else if (!*name)
+               /* Use our own empty string instead of allocating one: */
+               entry->name = object_array_slopbuf;
+       else
+               entry->name = xstrdup(name);
+       entry->mode = mode;
        array->nr = ++nr;
 }
 
@@ -289,6 +313,9 @@ void object_array_filter(struct object_array *array,
                        if (src != dst)
                                objects[dst] = objects[src];
                        dst++;
+               } else {
+                       if (objects[src].name != object_array_slopbuf)
+                               free(objects[src].name);
                }
        }
        array->nr = dst;
@@ -319,6 +346,9 @@ void object_array_remove_duplicates(struct object_array *array)
                        if (src != array->nr)
                                objects[array->nr] = objects[src];
                        array->nr++;
+               } else {
+                       if (objects[src].name != object_array_slopbuf)
+                               free(objects[src].name);
                }
        }
 }