merge-recursive: drop several unused parameters

diff --git a/sha1-array.h b/sha1-array.h
index 232bf9501729696846f514e13ce5f23c425d9d27..55d016c4bf7bf56936f034b7550996d1b7ca6473 100644 (file)
--- a/sha1-array.h
+++ b/sha1-array.h
@@ -22,5 +22,8 @@ int oid_array_for_each(struct oid_array *array,
 int oid_array_for_each_unique(struct oid_array *array,
                              for_each_oid_fn fn,
                              void *data);
+void oid_array_filter(struct oid_array *array,
+                     for_each_oid_fn want,
+                     void *cbdata);
 
 #endif /* SHA1_ARRAY_H */