summaryrefslogtreecommitdiff
path: root/graph.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-27 16:59:56 -0700
committerJunio C Hamano <gitster@pobox.com>2009-08-27 16:59:56 -0700
commit24343c609926e0163c9956b89c010e907fe755ee (patch)
tree98155e82f227175aa66405afa6882a84a9e7c46b /graph.c
parentadc542353199bdc0b9b1ed5d03cf881b7efaff6e (diff)
parentb97c470b577071b74315a0e57dd9a03dca120e93 (diff)
downloadgit-24343c609926e0163c9956b89c010e907fe755ee.tar.gz
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.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/graph.c b/graph.c
index f3226ec94a..6746d422a9 100644
--- a/graph.c
+++ b/graph.c
@@ -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,