Merge branch 'maint-1.5.4' into maint

diff --git a/list-objects.h b/list-objects.h
index 8a5fae66ec2d9c5c686447c48c4e043ada8a0ed1..0f41391ecc00eac324ea76de7654781c4fce094e 100644 (file)
--- a/list-objects.h
+++ b/list-objects.h
@@ -1,8 +1,12 @@
 #ifndef LIST_OBJECTS_H
 #define LIST_OBJECTS_H
 
-void traverse_commit_list(struct rev_info *revs,
-                         void (*show_commit)(struct commit *),
-                         void (*show_object)(struct object_array_entry *));
+typedef void (*show_commit_fn)(struct commit *);
+typedef void (*show_object_fn)(struct object_array_entry *);
+typedef void (*show_edge_fn)(struct commit *);
+
+void traverse_commit_list(struct rev_info *revs, show_commit_fn, show_object_fn);
+
+void mark_edges_uninteresting(struct commit_list *, struct rev_info *, show_edge_fn);
 
 #endif