summaryrefslogtreecommitdiff
path: root/merge-base.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-17 00:18:22 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-17 00:18:22 (GMT)
commitc82a22c39cbc32576f64f5c6b3f24b99ea8149c7 (patch)
treef7a9dcdadbe415494686641bd3134f71837bb469 /merge-base.c
parent2aa839614e9d4f8b84803fb4ce633d6a0981675f (diff)
downloadgit-c82a22c39cbc32576f64f5c6b3f24b99ea8149c7.zip
git-c82a22c39cbc32576f64f5c6b3f24b99ea8149c7.tar.gz
git-c82a22c39cbc32576f64f5c6b3f24b99ea8149c7.tar.bz2
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>
Diffstat (limited to 'merge-base.c')
-rw-r--r--merge-base.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/merge-base.c b/merge-base.c
index f0dc06e..4856ca0 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;