diff options
author | Junio C Hamano <junkio@cox.net> | 2006-04-16 22:07:28 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-04-16 22:07:28 -0700 |
commit | 9893e3eb92561fbfa397d30d571ac471fda146ee (patch) | |
tree | 507413793d05666387e0146a2370f7547af0716c /revision.c | |
parent | Merge branch 'master' into next (diff) | |
parent | rev-list --boundary: show boundary commits even when limited otherwise. (diff) | |
download | tgif-9893e3eb92561fbfa397d30d571ac471fda146ee.tar.xz |
Merge branch 'jc/boundary' into next
* jc/boundary:
rev-list --boundary: show boundary commits even when limited otherwise.
Makefile fixups.
gitk: Fix bug caused by missing commitlisted elements
Diffstat (limited to 'revision.c')
-rw-r--r-- | revision.c | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/revision.c b/revision.c index f8fb028855..3cd6a2ed9f 100644 --- a/revision.c +++ b/revision.c @@ -856,6 +856,17 @@ static void rewrite_parents(struct rev_info *revs, struct commit *commit) } } +static void mark_boundary_to_show(struct commit *commit) +{ + struct commit_list *p = commit->parents; + while (p) { + commit = p->item; + p = p->next; + if (commit->object.flags & BOUNDARY) + commit->object.flags |= BOUNDARY_SHOW; + } +} + struct commit *get_revision(struct rev_info *revs) { struct commit_list *list = revs->commits; @@ -893,8 +904,20 @@ struct commit *get_revision(struct rev_info *revs) } if (commit->object.flags & SHOWN) continue; - if (!(commit->object.flags & BOUNDARY) && - (commit->object.flags & UNINTERESTING)) + + /* We want to show boundary commits only when their + * children are shown. When path-limiter is in effect, + * rewrite_parents() drops some commits from getting shown, + * and there is no point showing boundary parents that + * are not shown. After rewrite_parents() rewrites the + * parents of a commit that is shown, we mark the boundary + * parents with BOUNDARY_SHOW. + */ + if (commit->object.flags & BOUNDARY_SHOW) { + commit->object.flags |= SHOWN; + return commit; + } + if (commit->object.flags & UNINTERESTING) continue; if (revs->min_age != -1 && (commit->date > revs->min_age)) continue; @@ -907,6 +930,8 @@ struct commit *get_revision(struct rev_info *revs) if (revs->parents) rewrite_parents(revs, commit); } + if (revs->boundary) + mark_boundary_to_show(commit); commit->object.flags |= SHOWN; return commit; } while (revs->commits); |