Move in_merge_bases() to commit.c

This reasonably useful function was hidden inside builtin-branch.c
This commit is contained in:
Junio C Hamano
2006-12-19 00:14:04 -08:00
parent e29cb53a8b
commit 2ecd2bbcbe
3 changed files with 19 additions and 20 deletions

View File

@ -1009,3 +1009,20 @@ struct commit_list *get_merge_bases(struct commit *one,
free(rslt);
return result;
}
int in_merge_bases(struct commit *rev1, struct commit *rev2)
{
struct commit_list *bases, *b;
int ret = 0;
bases = get_merge_bases(rev1, rev2, 1);
for (b = bases; b; b = b->next) {
if (!hashcmp(rev1->object.sha1, b->item->object.sha1)) {
ret = 1;
break;
}
}
free_commit_list(bases);
return ret;
}