diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-08-27 16:59:56 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-08-27 16:59:56 -0700 |
commit | 24343c609926e0163c9956b89c010e907fe755ee (patch) | |
tree | 98155e82f227175aa66405afa6882a84a9e7c46b /graph.c | |
parent | adc542353199bdc0b9b1ed5d03cf881b7efaff6e (diff) | |
parent | b97c470b577071b74315a0e57dd9a03dca120e93 (diff) | |
download | git-24343c609926e0163c9956b89c010e907fe755ee.tar.gz git-24343c609926e0163c9956b89c010e907fe755ee.tar.xz |
Merge branch 'as/maint-graph-interesting-fix'
* as/maint-graph-interesting-fix:
Add tests for rev-list --graph with options that simplify history
graph API: fix bug in graph_is_interesting()
Diffstat (limited to 'graph.c')
-rw-r--r-- | graph.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -291,9 +291,10 @@ static int graph_is_interesting(struct git_graph *graph, struct commit *commit) } /* - * Uninteresting and pruned commits won't be printed + * Otherwise, use get_commit_action() to see if this commit is + * interesting */ - return (commit->object.flags & (UNINTERESTING | TREESAME)) ? 0 : 1; + return get_commit_action(graph->revs, commit) == commit_show; } static struct commit_list *next_interesting_parent(struct git_graph *graph, |