Merge branch 'jc/blame' into next

diff --git a/blame.c b/blame.c
index 75cffd8a3f471cea4043df9b555099ecb4d4c5b7..6730b10b115250e088887879d075559a36ddc7b1 100644 (file)
--- a/blame.c
+++ b/blame.c
@@ -819,6 +819,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);