Merge branch 'sb/maint-1.6.0-add-config-fix' into maint

[git.git] / bisect.h

diff --git a/bisect.h b/bisect.h
index 05eea175f792ad3944b6e6584c4380318e4b2489..fdba9138773f6f6a4f36655f81965e955e79b3bc 100644 (file)
--- a/bisect.h
+++ b/bisect.h
@@ -9,13 +9,20 @@ extern struct commit_list *filter_skipped(struct commit_list *list,
                                          struct commit_list **tried,
                                          int show_all);
 
-/*
- * The "show_all" parameter should be 0 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 show_all, int show_tried);
+/* bisect_show_flags flags in struct rev_list_info */
+#define BISECT_SHOW_ALL                (1<<0)
+#define BISECT_SHOW_TRIED      (1<<1)
+#define BISECT_SHOW_STRINGED   (1<<2)
+
+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_vars(const char *prefix);