From: Junio C Hamano <junkio@cox.net>
Date: Mon, 3 Jul 2006 10:14:32 +0000 (-0700)
Subject: Merge branch 'master' into js/merge-base
X-Git-Tag: v1.4.2-rc1~77^2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f23c75a8eca5eeabf9aaf303ee7e14a94da42ddc;p=git.git

Merge branch 'master' into js/merge-base

This is to pull in the object-hash clean-up from the master branch.
---

f23c75a8eca5eeabf9aaf303ee7e14a94da42ddc
diff --cc object.c
index 9caba4fac,37277f943..1c3675971
--- a/object.c
+++ b/object.c
@@@ -217,12 -235,3 +235,12 @@@ void add_object_array(struct object *ob
  	objects[nr].name = name;
  	array->nr = ++nr;
  }
 +
 +void clear_object_marks(unsigned mark)
 +{
 +	int i;
 +
- 	for (i = 0; i < obj_allocs; i++)
- 		if (objs[i])
- 			objs[i]->flags &= ~mark;
++	for (i = 0; i < obj_hash_size; i++)
++		if (obj_hash[i])
++			obj_hash[i]->flags &= ~mark;
 +}