Merge branch 'master' into next

* master: blame.c: fix completely broken ancestry traversal.
git-mirror · Apr 6, 2006 · 2db70f6 · 2db70f6
2 parents 9cda21d + ba3c937
commit 2db70f6
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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);