Merge branch 'master' into next

Junio C Hamano · Junio C Hamano · commit 2db70f684ad6 · 2006-04-05T18:22:19.000-07:00
* master:
  blame.c: fix completely broken ancestry traversal.
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);
