Skip to content

Commit

Permalink
merge-base: Clarify the comments on post processing.
Browse files Browse the repository at this point in the history
The comment fooled myself believing that we still had an
unsolved horizon effect.

Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Junio C Hamano committed May 17, 2006
1 parent 2aa8396 commit c82a22c
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions merge-base.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit c82a22c

Please sign in to comment.