kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

in_merge_bases(): use paint_down_to_common() 

With paint_down_to_common(), we can tell if "commit" is reachable
from "reference" by simply looking at its object flag, instead of
iterating over the merge bases.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 2012-08-30 15:04:13 -07:00
parent da1f515641
commit 6440fdbab4
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
commit.c
View File

@ -786,20 +786,17 @@ int is_descendant_of(struct commit *commit, struct commit_list *with_commit)
*/ */
int in_merge_bases(struct commit *commit, struct commit *reference) int in_merge_bases(struct commit *commit, struct commit *reference)
{ {
struct commit_list *bases, *b; struct commit_list *bases;
int ret = 0; int ret = 0;


bases = merge_bases_many(commit, 1, &reference); if (parse_commit(commit) || parse_commit(reference))
return ret;

bases = paint_down_to_common(commit, 1, &reference);
if (commit->object.flags & PARENT2)
ret = 1;
clear_commit_marks(commit, all_flags); clear_commit_marks(commit, all_flags);
clear_commit_marks(reference, all_flags); clear_commit_marks(reference, all_flags);

for (b = bases; b; b = b->next) {
if (!hashcmp(commit->object.sha1, b->item->object.sha1)) {
ret = 1;
break;
}
}

free_commit_list(bases); free_commit_list(bases);
return ret; return ret;
} }