[PATCH] no branch

[Eric Wong <e@80x24.org>]

---
 object.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/object.c b/object.c
index 4219da9e3b..0224712a1c 100644
--- a/object.c
+++ b/object.c
@@ -74,12 +74,10 @@ static unsigned int hash_obj(const struct object_id *oid, unsigned int n)
 static void insert_obj_hash(struct object *obj, struct object **hash, unsigned int size)
 {
 	unsigned int j = hash_obj(&obj->oid, size);
+	unsigned int mask = size - 1;
 
-	while (hash[j]) {
-		j++;
-		if (j >= size)
-			j = 0;
-	}
+	while (hash[j])
+		j = (j + 1) & mask;
 	hash[j] = obj;
 }
 
@@ -89,19 +87,18 @@ static void insert_obj_hash(struct object *obj, struct object **hash, unsigned i
  */
 struct object *lookup_object(struct repository *r, const struct object_id *oid)
 {
-	unsigned int i, first;
+	unsigned int i, first, mask;
 	struct object *obj;
 
 	if (!r->parsed_objects->obj_hash)
 		return NULL;
 
 	first = i = hash_obj(oid, r->parsed_objects->obj_hash_size);
+	mask = r->parsed_objects->obj_hash_size - 1;
 	while ((obj = r->parsed_objects->obj_hash[i]) != NULL) {
 		if (oideq(oid, &obj->oid))
 			break;
-		i++;
-		if (i == r->parsed_objects->obj_hash_size)
-			i = 0;
+		i = (i + 1) & mask;
 	}
 	if (obj && i != first) {
 		/*