Set the default help format to html for msys builds.

diff --git a/object.c b/object.c
index 0498b18d451b2335d21e2db3edc0ce7838aaa50e..88d0bece8116862681ba9fee3f9e0dfdec7f8b17 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;
 }
 
@@ -176,7 +186,7 @@ struct object *parse_object_buffer(const unsigned char *sha1, enum object_type t
                        obj = &tag->object;
                }
        } else {
-               warning("object %s has unknown type id %d\n", sha1_to_hex(sha1), type);
+               warning("object %s has unknown type id %d", sha1_to_hex(sha1), type);
                obj = NULL;
        }
        if (obj && obj->type == OBJ_NONE)
@@ -185,6 +195,16 @@ struct object *parse_object_buffer(const unsigned char *sha1, enum object_type t
        return obj;
 }
 
+struct object *parse_object_or_die(const unsigned char *sha1,
+                                  const char *name)
+{
+       struct object *o = parse_object(sha1);
+       if (o)
+               return o;
+
+       die(_("unable to parse object: %s"), name ? name : sha1_to_hex(sha1));
+}
+
 struct object *parse_object(const unsigned char *sha1)
 {
        unsigned long size;
@@ -202,7 +222,7 @@ struct object *parse_object(const unsigned char *sha1)
            (!obj && has_sha1_file(sha1) &&
             sha1_object_info(sha1, NULL) == OBJ_BLOB)) {
                if (check_sha1_signature(repl, NULL, 0, NULL) < 0) {
-                       error("sha1 mismatch %s\n", sha1_to_hex(repl));
+                       error("sha1 mismatch %s", sha1_to_hex(repl));
                        return NULL;
                }
                parse_blob_buffer(lookup_blob(sha1), NULL, 0);
@@ -213,7 +233,7 @@ struct object *parse_object(const unsigned char *sha1)
        if (buffer) {
                if (check_sha1_signature(repl, buffer, size, typename(type)) < 0) {
                        free(buffer);
-                       error("sha1 mismatch %s\n", sha1_to_hex(repl));
+                       error("sha1 mismatch %s", sha1_to_hex(repl));
                        return NULL;
                }
 
@@ -286,3 +306,14 @@ void object_array_remove_duplicates(struct object_array *array)
                array->nr = dst;
        }
 }
+
+void clear_object_flags(unsigned flags)
+{
+       int i;
+
+       for (i=0; i < obj_hash_size; i++) {
+               struct object *obj = obj_hash[i];
+               if (obj)
+                       obj->flags &= ~flags;
+       }
+}