t7004: use "test-tool ref-store" for reflog inspection

[thirdparty/git.git] / bisect.h

diff --git a/bisect.h b/bisect.h
index 4e69a11ea8f3c60fe0c273fc4af98760fd236f09..ec24ac2d7ee9d18fa6a9188534040602fd728e38 100644 (file)
--- a/bisect.h
+++ b/bisect.h
@@ -12,7 +12,7 @@ struct repository;
  * best commit, as chosen by `find_all`.
  */
 void find_bisection(struct commit_list **list, int *reaches, int *all,
-                   int find_all);
+                   unsigned bisect_flags);
 
 struct commit_list *filter_skipped(struct commit_list *list,
                                   struct commit_list **tried,
@@ -23,6 +23,9 @@ struct commit_list *filter_skipped(struct commit_list *list,
 #define BISECT_SHOW_ALL                (1<<0)
 #define REV_LIST_QUIET         (1<<1)
 
+#define FIND_BISECTION_ALL                     (1u<<0)
+#define FIND_BISECTION_FIRST_PARENT_ONLY       (1u<<1)
+
 struct rev_list_info {
        struct rev_info *revs;
        int flags;
@@ -31,9 +34,34 @@ struct rev_list_info {
        const char *header_prefix;
 };
 
-int bisect_next_all(struct repository *r,
-                   const char *prefix,
-                   int no_checkout);
+/*
+ * enum bisect_error represents the following return codes:
+ * BISECT_OK: success code. Internally, it means that next
+ * commit has been found (and possibly checked out) and it
+ * should be tested.
+ * BISECT_FAILED error code: default error code.
+ * BISECT_ONLY_SKIPPED_LEFT error code: only skipped
+ * commits left to be tested.
+ * BISECT_MERGE_BASE_CHECK error code: merge base check failed.
+ * BISECT_NO_TESTABLE_COMMIT error code: no testable commit found.
+ * BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND early success code:
+ * first term_bad commit found.
+ * BISECT_INTERNAL_SUCCESS_MERGE_BASE early success
+ * code: found merge base that should be tested.
+ * Early success codes BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND and
+ * BISECT_INTERNAL_SUCCESS_MERGE_BASE should be only internal codes.
+ */
+enum bisect_error {
+       BISECT_OK = 0,
+       BISECT_FAILED = -1,
+       BISECT_ONLY_SKIPPED_LEFT = -2,
+       BISECT_MERGE_BASE_CHECK = -3,
+       BISECT_NO_TESTABLE_COMMIT = -4,
+       BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND = -10,
+       BISECT_INTERNAL_SUCCESS_MERGE_BASE = -11
+};
+
+enum bisect_error bisect_next_all(struct repository *r, const char *prefix);
 
 int estimate_bisect_steps(int all);