development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 19:49:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ds/merge-base-is-ancestor-optim'

Browse source 
"git merge-base --is-ancestor" is taught to take advantage of the
commit graph.

* ds/merge-base-is-ancestor-optim:
  commit-reach: use fast logic in repo_in_merge_base
  commit-reach: create repo_is_descendant_of()
This commit is contained in:
Junio C Hamano 2020-06-25 12:27:47 -07:00
parent 7b2685ef2d 80b8ada547
commit dc4b3cfb92
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
commit-reach.c
View file

@ -283,7 +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?
*/
int is_descendant_of(struct commit *commit, struct commit_list *with_commit)
static int repo_is_descendant_of(struct repository *r,
struct commit *commit,
struct commit_list *with_commit)
{
if (!with_commit)
return 1;
@ -301,13 +303,18 @@ int is_descendant_of(struct commit *commit, struct commit_list *with_commit)
other = with_commit->item;
with_commit = with_commit->next;
if (in_merge_bases(other, commit))
if (repo_in_merge_bases_many(r, other, 1, &commit))
return 1;
}
return 0;
}
}
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"?
*/
@ -348,7 +355,15 @@ int repo_in_merge_bases(struct repository *r,
struct commit *commit,
struct commit *reference)
{
return repo_in_merge_bases_many(r, commit, 1, &reference);
int res;
struct commit_list *list = NULL;
struct commit_list **next = &list;
next = commit_list_append(commit, next);
res = repo_is_descendant_of(r, reference, list);
free_commit_list(list);
return res;
}
struct commit_list *reduce_heads(struct commit_list *heads)