Merge branch 'rs/strbuf-read-file-or-whine'

diff --git a/list-objects.h b/list-objects.h
index 69c4c7de6efef0e6faa21a10438ea362b151e623..aa618d7f4579b2ec9c4e506f821caa1fc3fb2b37 100644 (file)
--- a/list-objects.h
+++ b/list-objects.h
@@ -2,10 +2,21 @@
 #define LIST_OBJECTS_H
 
 typedef void (*show_commit_fn)(struct commit *, void *);
-typedef void (*show_object_fn)(struct object *, struct strbuf *, const char *, void *);
+typedef void (*show_object_fn)(struct object *, const char *, void *);
 void traverse_commit_list(struct rev_info *, show_commit_fn, show_object_fn, void *);
 
 typedef void (*show_edge_fn)(struct commit *);
 void mark_edges_uninteresting(struct rev_info *, show_edge_fn);
 
-#endif
+struct oidset;
+struct list_objects_filter_options;
+
+void traverse_commit_list_filtered(
+       struct list_objects_filter_options *filter_options,
+       struct rev_info *revs,
+       show_commit_fn show_commit,
+       show_object_fn show_object,
+       void *show_data,
+       struct oidset *omitted);
+
+#endif /* LIST_OBJECTS_H */