X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=merge-base.c;h=4856ca01c33896843c366f3fb5edadd2ea3ced37;hb=fb6a9f93d39e4e5fdb83673a927f71a34e9fb7c0;hp=f0dc06ef5546b148fe20d3b1061c7eae0d262cce;hpb=5c222ce2c415ccf7ce1e9281eb49f0a6f26657fa;p=git.git diff --git a/merge-base.c b/merge-base.c index f0dc06ef..4856ca01 100644 --- a/merge-base.c +++ b/merge-base.c @@ -82,8 +82,9 @@ static struct commit *interesting(struct commit_list *list) * commit B. * * - * Another pathological example how this thing can fail to mark an ancestor - * of a merge base as UNINTERESTING without the postprocessing phase. + * Another pathological example how this thing used to fail to mark an + * ancestor of a merge base as UNINTERESTING before we introduced the + * postprocessing phase (mark_reachable_commits). * * 2 * H @@ -118,7 +119,9 @@ static struct commit *interesting(struct commit_list *list) * D7 2 3 7 7 3 2 1 2 * E7 2 3 7 7 7 2 1 2 * - * and we end up showing E as an interesting merge base. + * and we ended up showing E as an interesting merge base. + * The postprocessing phase re-injects C and continues traversal + * to contaminate D and E. */ static int show_all = 0;