undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-base: Clarify the comments on post processing.

Browse Source 
The comment fooled myself believing that we still had an
unsolved horizon effect.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-05-16 17:18:22 -07:00
parent 2aa839614e
commit c82a22c39c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
merge-base.c
View File

@ -82,8 +82,9 @@ static struct commit *interesting(struct commit_list *list)
* commit B. * commit B.
* *
* *
* Another pathological example how this thing can fail to mark an ancestor * Another pathological example how this thing used to fail to mark an
* of a merge base as UNINTERESTING without the postprocessing phase. * ancestor of a merge base as UNINTERESTING before we introduced the
* postprocessing phase (mark_reachable_commits).
* *
* 2 * 2
* H * H
@ -118,7 +119,9 @@ static struct commit *interesting(struct commit_list *list)
* D7 2 3 7 7 3 2 1 2 * D7 2 3 7 7 3 2 1 2
* E7 2 3 7 7 7 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; static int show_all = 0;