diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-03-03 15:16:52 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-03-03 15:16:52 +0900 |
| commit | f80fcd36751c85b11722f8c7cfd537c28956400e (patch) | |
| tree | e37c20841191c07d5c6c62edb9d174c38dd6bb82 /commit-reach.h | |
| parent | a9f2d3f200d9d8b6e803c0818b1163226bbc3994 (diff) | |
| download | git-f80fcd36751c85b11722f8c7cfd537c28956400e.tar.gz git-f80fcd36751c85b11722f8c7cfd537c28956400e.tar.bz2 git-f80fcd36751c85b11722f8c7cfd537c28956400e.zip | |
Imported Upstream version 2.21.0upstream/2.21.0
Diffstat (limited to 'commit-reach.h')
| -rw-r--r-- | commit-reach.h | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/commit-reach.h b/commit-reach.h index fb8082a2..99a43e8b 100644 --- a/commit-reach.h +++ b/commit-reach.h @@ -9,21 +9,35 @@ struct ref_filter; struct object_id; struct object_array; -struct commit_list *get_merge_bases_many(struct commit *one, - int n, - struct commit **twos); -struct commit_list *get_merge_bases_many_dirty(struct commit *one, - int n, - struct commit **twos); -struct commit_list *get_merge_bases(struct commit *one, struct commit *two); -struct commit_list *get_octopus_merge_bases(struct commit_list *in); - +struct commit_list *repo_get_merge_bases(struct repository *r, + struct commit *rev1, + struct commit *rev2); +struct commit_list *repo_get_merge_bases_many(struct repository *r, + struct commit *one, int n, + struct commit **twos); /* To be used only when object flags after this call no longer matter */ -struct commit_list *get_merge_bases_many_dirty(struct commit *one, int n, struct commit **twos); +struct commit_list *repo_get_merge_bases_many_dirty(struct repository *r, + struct commit *one, int n, + struct commit **twos); +#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS +#define get_merge_bases(r1, r2) repo_get_merge_bases(the_repository, r1, r2) +#define get_merge_bases_many(one, n, two) repo_get_merge_bases_many(the_repository, one, n, two) +#define get_merge_bases_many_dirty(one, n, twos) repo_get_merge_bases_many_dirty(the_repository, one, n, twos) +#endif + +struct commit_list *get_octopus_merge_bases(struct commit_list *in); int is_descendant_of(struct commit *commit, struct commit_list *with_commit); -int in_merge_bases_many(struct commit *commit, int nr_reference, struct commit **reference); -int in_merge_bases(struct commit *commit, struct commit *reference); +int repo_in_merge_bases(struct repository *r, + struct commit *commit, + struct commit *reference); +int repo_in_merge_bases_many(struct repository *r, + struct commit *commit, + int nr_reference, struct commit **reference); +#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS +#define in_merge_bases(c1, c2) repo_in_merge_bases(the_repository, c1, c2) +#define in_merge_bases_many(c1, n, cs) repo_in_merge_bases_many(the_repository, c1, n, cs) +#endif /* * Takes a list of commits and returns a new list where those |