merge-base: Clarify the comments on post processing.
The comment fooled myself believing that we still had an unsolved horizon effect. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
May 16, 2006 at 17:18 UTC
c82a22c39cbc32576f64f5c6b3f24b99ea8149c7
1 file changed
+6
-3
merge-base.c
+6
-3
@@ -82,8 +82,9 @@ static struct commit *interesting(struct commit_list *list)
82
* commit B.
83
*
84
*
85
- * Another pathological example how this thing can fail to mark an ancestor
86
- * of a merge base as UNINTERESTING without the postprocessing phase.
85
+ * Another pathological example how this thing used to fail to mark an
86
+ * ancestor of a merge base as UNINTERESTING before we introduced the
87
+ * postprocessing phase (mark_reachable_commits).
88
*
89
* 2
90
* H
@@ -118,7 +119,9 @@ static struct commit *interesting(struct commit_list *list)
119
* D7 2 3 7 7 3 2 1 2
120
* E7 2 3 7 7 7 2 1 2
121
*
121
- * and we end up showing E as an interesting merge base.
122
+ * and we ended up showing E as an interesting merge base.
123
+ * The postprocessing phase re-injects C and continues traversal
124
+ * to contaminate D and E.
125
*/
126
127
static int show_all = 0;