Merge branch 'master' into next

* master:
  blame.c: fix completely broken ancestry traversal.

1 files changed, 1 insertions, 0 deletions

diff --git a/blame.c b/blame.c
index 1ee0d323ca..a5964107cb 100644
--- a/blame.c
+++ b/blame.c
@@ -787,6 +787,7 @@ int main(int argc, const char **argv)
 	rev.prune_fn = simplify_commit;
 	rev.topo_setter = topo_setter;
 	rev.topo_getter = topo_getter;
+	rev.parents = 1;
 	rev.limited = 1;
 
 	commit_list_insert(start_commit, &rev.commits);