提交 2ef10801 编写于 作者: J Junio C Hamano

get_merge_bases: clean up even when there is no common commit.

Actually in this case we would have traversed a lot of commits, so cleaning
things up is even more important.
Signed-off-by: NJunio C Hamano <junkio@cox.net>
上级 542ccefe
......@@ -1058,7 +1058,7 @@ struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2,
}
if (!result)
return NULL;
goto finish;
if (result->next && list)
mark_reachable_commits(result, list);
......@@ -1081,6 +1081,7 @@ struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2,
tmp = next;
}
finish:
if (cleanup) {
clear_commit_marks(rev1, PARENT1 | PARENT2 | STALE);
clear_commit_marks(rev2, PARENT1 | PARENT2 | STALE);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册