Merge branch 'master' into next

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

diff --git a/blame.c b/blame.c
index 1ee0d323ca7d5397c95f0d55f2279d2ca5dc0c8f..a5964107cbdbd752dc6b8c77f4105a109b2e9e3f 100644 (file)
--- 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);