Merge branch 'master' into sb/opt-filename

[~andy/git] / bisect.h

diff --git a/bisect.h b/bisect.h
index 31c99fe5f4deceb657b50d1fb1f446568c208400..fb744fdb79e1dd4a46cd3f2759b73747d8e79fbd 100644 (file)
--- a/bisect.h
+++ b/bisect.h
@@ -5,7 +5,30 @@ extern struct commit_list *find_bisection(struct commit_list *list,
                                          int *reaches, int *all,
                                          int find_all);
 
-extern int show_bisect_vars(struct rev_info *revs, int reaches, int all,
-                           int show_all);
+extern struct commit_list *filter_skipped(struct commit_list *list,
+                                         struct commit_list **tried,
+                                         int show_all);
+
+extern void print_commit_list(struct commit_list *list,
+                             const char *format_cur,
+                             const char *format_last);
+
+/* bisect_show_flags flags in struct rev_list_info */
+#define BISECT_SHOW_ALL                (1<<0)
+#define BISECT_SHOW_TRIED      (1<<1)
+
+struct rev_list_info {
+       struct rev_info *revs;
+       int bisect_show_flags;
+       int show_timestamp;
+       int hdr_termination;
+       const char *header_prefix;
+};
+
+extern int show_bisect_vars(struct rev_list_info *info, int reaches, int all);
+
+extern int bisect_next_all(const char *prefix);
+
+extern int estimate_bisect_steps(int all);
 
 #endif