diff options
author | Vincent Ambo <mail@tazj.in> | 2021-09-21T10·03+0300 |
---|---|---|
committer | Vincent Ambo <mail@tazj.in> | 2021-09-21T11·29+0300 |
commit | 43b1791ec601732ac31195df96781a848360a9ac (patch) | |
tree | daae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/bisect.h | |
parent | 2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (diff) |
chore(3p/git): Unvendor git and track patches instead r/2903
This was vendored a long time ago under the expectation that keeping it in sync with cgit would be easier this way, but it has proven not to be a big issue. On the other hand, a vendored copy of git is an annoying maintenance burden. It is much easier to rebase the single (dottime) patch that we have. This removes the vendored copy of git and instead passes the git source code to cgit via `pkgs.srcOnly`, which includes the applied patch so that cgit can continue rendering dottime. Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b
Diffstat (limited to 'third_party/git/bisect.h')
-rw-r--r-- | third_party/git/bisect.h | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/third_party/git/bisect.h b/third_party/git/bisect.h deleted file mode 100644 index ec24ac2d7ee9..000000000000 --- a/third_party/git/bisect.h +++ /dev/null @@ -1,72 +0,0 @@ -#ifndef BISECT_H -#define BISECT_H - -struct commit_list; -struct repository; - -/* - * Find bisection. If something is found, `reaches` will be the number of - * commits that the best commit reaches. `all` will be the count of - * non-SAMETREE commits. If nothing is found, `list` will be NULL. - * Otherwise, it will be either all non-SAMETREE commits or the single - * best commit, as chosen by `find_all`. - */ -void find_bisection(struct commit_list **list, int *reaches, int *all, - unsigned bisect_flags); - -struct commit_list *filter_skipped(struct commit_list *list, - struct commit_list **tried, - int show_all, - int *count, - int *skipped_first); - -#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; - int show_timestamp; - int hdr_termination; - 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, const char *prefix); - -int estimate_bisect_steps(int all); - -void read_bisect_terms(const char **bad, const char **good); - -int bisect_clean_state(void); - -#endif |