diff options
| author | Adam Simpkins <adam@adamsimpkins.net> | 2008-05-24 16:02:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-25 12:22:24 -0700 |
| commit | 4603ec0f960e582a7da7241563d3f235ad7f0d3e (patch) | |
| tree | 669acf8c2eee31d2e9bae8a7ff40410498784bb3 /graph.c | |
| parent | 3c68d67b572bce7ff41de463e75ee093e9dd71b7 (diff) | |
| download | git-4603ec0f960e582a7da7241563d3f235ad7f0d3e.tar.gz | |
get_revision(): honor the topo_order flag for boundary commits
Now get_revision() sorts the boundary commits when topo_order is set.
Since sort_in_topological_order() takes a struct commit_list, it first
places the boundary commits into revs->commits.
Signed-off-by: Adam Simpkins <adam@adamsimpkins.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'graph.c')
| -rw-r--r-- | graph.c | 9 |
1 files changed, 1 insertions, 8 deletions
@@ -195,16 +195,9 @@ static int graph_is_interesting(struct git_graph *graph, struct commit *commit) * If revs->boundary is set, commits whose children have * been shown are always interesting, even if they have the * UNINTERESTING or TREESAME flags set. - * - * However, ignore the commit if SHOWN is set. If SHOWN is set, - * the commit is interesting, but it has already been printed. - * This can happen because get_revision() doesn't return the - * boundary commits in topological order, even when - * revs->topo_order is set. */ if (graph->revs && graph->revs->boundary) { - if ((commit->object.flags & (SHOWN | CHILD_SHOWN)) == - CHILD_SHOWN) + if (commit->object.flags & CHILD_SHOWN) return 1; } |