mailmap: simplify map_user() interface

diff --git a/bisect.h b/bisect.h
index f5d106735c41f9657b5d568ae3453386c9a64c08..2a6c831f3ecdd12839dff9a9740881fc836b09bd 100644 (file)
--- a/bisect.h
+++ b/bisect.h
@@ -7,21 +7,23 @@ extern struct commit_list *find_bisection(struct commit_list *list,
 
 extern struct commit_list *filter_skipped(struct commit_list *list,
                                          struct commit_list **tried,
-                                         int show_all);
+                                         int show_all,
+                                         int *count,
+                                         int *skipped_first);
 
-/* show_bisect_vars flags */
 #define BISECT_SHOW_ALL                (1<<0)
-#define BISECT_SHOW_TRIED      (1<<1)
-#define BISECT_SHOW_STRINGED   (1<<2)
+#define REV_LIST_QUIET         (1<<1)
 
-/*
- * The flag BISECT_SHOW_ALL should not be set if this function is called
- * from outside "builtin-rev-list.c" as otherwise it would use
- * static "revs" from this file.
- */
-extern int show_bisect_vars(struct rev_info *revs, int reaches, int all,
-                           int flags);
+struct rev_list_info {
+       struct rev_info *revs;
+       int flags;
+       int show_timestamp;
+       int hdr_termination;
+       const char *header_prefix;
+};
 
-extern int bisect_next_vars(const char *prefix);
+extern int bisect_next_all(const char *prefix, int no_checkout);
+
+extern int estimate_bisect_steps(int all);
 
 #endif