From c1ea625f72110fda87fd225d7dff002befb82d9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= Date: Tue, 23 Jun 2020 11:42:22 -0700 Subject: commit-reach: avoid is_descendant_of() shim MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit d91d6fbf26 (commit-reach: create repo_is_descendant_of(), 2020-06-17) adds a repository aware version of is_descendant_of() and a backward compatibility shim that is barely used. Update all callers to directly use the new repo_is_descendant_of() function instead; making the codebase simpler and pushing more the_repository references higher up the stack. Helped-by: Derrick Stolee Signed-off-by: Carlo Marcelo Arenas Belón Reviewed-by: Derrick Stolee Signed-off-by: Junio C Hamano --- commit-reach.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'commit-reach.c') diff --git a/commit-reach.c b/commit-reach.c index 43e303d5f2..2d85265a35 100644 --- a/commit-reach.c +++ b/commit-reach.c @@ -283,9 +283,9 @@ struct commit_list *repo_get_merge_bases(struct repository *r, /* * Is "commit" a descendant of one of the elements on the "with_commit" list? */ -static int repo_is_descendant_of(struct repository *r, - struct commit *commit, - struct commit_list *with_commit) +int repo_is_descendant_of(struct repository *r, + struct commit *commit, + struct commit_list *with_commit) { if (!with_commit) return 1; @@ -310,11 +310,6 @@ static int repo_is_descendant_of(struct repository *r, } } -int is_descendant_of(struct commit *commit, struct commit_list *with_commit) -{ - return repo_is_descendant_of(the_repository, commit, with_commit); -} - /* * Is "commit" an ancestor of one of the "references"? */ @@ -432,7 +427,8 @@ int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid) return 0; commit_list_insert(old_commit, &old_commit_list); - return is_descendant_of(new_commit, old_commit_list); + return repo_is_descendant_of(the_repository, + new_commit, old_commit_list); } /* @@ -551,7 +547,7 @@ int commit_contains(struct ref_filter *filter, struct commit *commit, { if (filter->with_commit_tag_algo) return contains_tag_algo(commit, list, cache) == CONTAINS_YES; - return is_descendant_of(commit, list); + return repo_is_descendant_of(the_repository, commit, list); } static int compare_commits_by_gen(const void *_a, const void *_b) -- cgit v1.2.3