in_merge_bases(): omit unnecessary redundant common ancestor reduction
The function get_merge_bases() needs to postprocess the result from merge_bases_many() in order to make sure none of the commit is a true ancestor of another commit, which is expensive. However, when checking if a commit is an ancestor of another commit, we only need to see if the commit is a common ancestor between the two, and do not have to care if other common ancestors merge_bases_many() finds are true merge bases or an ancestor of another merge base. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thomas Rast committed
Aug 23, 2012 at 16:20 UTC
b0f9e9eeef0ed4f21fc9bfa92f1314e3112d5cc1
1 file changed
+4
-1
commit.c
+4
-1
@@ -780,7 +780,10 @@ int in_merge_bases(struct commit *commit, struct commit *reference)
780
struct commit_list *bases, *b;
781
int ret = 0;
782
783
- bases = get_merge_bases(commit, reference, 1);
783
+ bases = merge_bases_many(commit, 1, &reference);
784
+ clear_commit_marks(commit, all_flags);
785
+ clear_commit_marks(reference, all_flags);
786
+
787
for (b = bases; b; b = b->next) {
788
if (!hashcmp(commit->object.sha1, b->item->object.sha1)) {
789
ret = 1;