summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2aa8396)
raw | patch | inline | side by side (parent: 2aa8396)
author | Junio C Hamano <junkio@cox.net> | |
Wed, 17 May 2006 00:18:22 +0000 (17:18 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Wed, 17 May 2006 00:18:22 +0000 (17:18 -0700) |
The comment fooled myself believing that we still had an
unsolved horizon effect.
Signed-off-by: Junio C Hamano <junkio@cox.net>
unsolved horizon effect.
Signed-off-by: Junio C Hamano <junkio@cox.net>
merge-base.c | patch | blob | history |
diff --git a/merge-base.c b/merge-base.c
index f0dc06ef5546b148fe20d3b1061c7eae0d262cce..4856ca01c33896843c366f3fb5edadd2ea3ced37 100644 (file)
--- a/merge-base.c
+++ b/merge-base.c
* 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
* 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;