diff options
author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
---|---|---|
committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/bisect.h | |
parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/bisect.h')
-rw-r--r-- | third_party/git/bisect.h | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/third_party/git/bisect.h b/third_party/git/bisect.h index 8bad8d839154..4e69a11ea8f3 100644 --- a/third_party/git/bisect.h +++ b/third_party/git/bisect.h @@ -31,34 +31,7 @@ struct rev_list_info { const char *header_prefix; }; -/* - * 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, +int bisect_next_all(struct repository *r, const char *prefix, int no_checkout); |