Merge branch 'ab/fail-prereqs-in-test'

diff --git a/oidset.h b/oidset.h
index c9d0f6d3cc8b99959d8637dcbf8ecb235021104e..505fad578bec1691fde9f28342d4c476c60dd50c 100644 (file)
--- a/oidset.h
+++ b/oidset.h
@@ -16,23 +16,11 @@
  *      table overhead.
  */
 
-static inline unsigned int oid_hash(struct object_id oid)
-{
-       return sha1hash(oid.hash);
-}
-
-static inline int oid_equal(struct object_id a, struct object_id b)
-{
-       return oideq(&a, &b);
-}
-
-KHASH_INIT(oid, struct object_id, int, 0, oid_hash, oid_equal)
-
 /**
  * A single oidset; should be zero-initialized (or use OIDSET_INIT).
  */
 struct oidset {
-       kh_oid_t set;
+       kh_oid_set_t set;
 };
 
 #define OIDSET_INIT { { 0 } }
@@ -74,7 +62,7 @@ int oidset_remove(struct oidset *set, const struct object_id *oid);
 void oidset_clear(struct oidset *set);
 
 struct oidset_iter {
-       kh_oid_t *set;
+       kh_oid_set_t *set;
        khiter_t iter;
 };