add -p: adjust offsets of subsequent hunks when one is skipped

diff --git a/list-objects.h b/list-objects.h
index 0b2de64301b59b5e27ca738242c92109332f9e07..aa618d7f4579b2ec9c4e506f821caa1fc3fb2b37 100644 (file)
--- a/list-objects.h
+++ b/list-objects.h
@@ -1,12 +1,22 @@
 #ifndef LIST_OBJECTS_H
 #define LIST_OBJECTS_H
 
-typedef void (*show_commit_fn)(struct commit *);
-typedef void (*show_object_fn)(struct object *, const struct name_path *, const char *);
+typedef void (*show_commit_fn)(struct commit *, 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);
 
-void traverse_commit_list(struct rev_info *revs, show_commit_fn, show_object_fn);
+struct oidset;
+struct list_objects_filter_options;
 
-void mark_edges_uninteresting(struct commit_list *, struct rev_info *, show_edge_fn);
+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
+#endif /* LIST_OBJECTS_H */