Skip to content

Commit

Permalink
Merge branch 'ds/merge-base-is-ancestor-optim' into jch
Browse files Browse the repository at this point in the history
"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()
  • Loading branch information
gitster committed Jun 18, 2020
2 parents d71c431 + 80b8ada commit dd64d65
Showing 1 changed file with 18 additions and 3 deletions.
21 changes: 18 additions & 3 deletions commit-reach.c
Expand Up @@ -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;
Expand All @@ -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"?
*/
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit dd64d65

Please sign in to comment.