mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cb/is-descendant-of'

Browse Source 
Code clean-up.

* cb/is-descendant-of:
  commit-reach: avoid is_descendant_of() shim
This commit is contained in:
Junio C Hamano
2020-07-06 22:09:15 -07:00
parent 5c61d10b16 c1ea625f72
commit 0258ed1e08
4 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
commit-reach.c
View File

@ -286,9 +286,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;
@ -313,11 +313,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"?
*/
@ -439,7 +434,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);
ret = is_descendant_of(new_commit, old_commit_list);
ret = repo_is_descendant_of(the_repository,
new_commit, old_commit_list);
free_commit_list(old_commit_list);
return ret;
}
@ -562,7 +558,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)