Merge branch 'maint-1.6.1' into maint-1.6.2

diff --git a/list-objects.h b/list-objects.h
index 0f41391ecc00eac324ea76de7654781c4fce094e..0b2de64301b59b5e27ca738242c92109332f9e07 100644 (file)
--- a/list-objects.h
+++ b/list-objects.h
@@ -2,7 +2,7 @@
 #define LIST_OBJECTS_H
 
 typedef void (*show_commit_fn)(struct commit *);
-typedef void (*show_object_fn)(struct object_array_entry *);
+typedef void (*show_object_fn)(struct object *, const struct name_path *, const char *);
 typedef void (*show_edge_fn)(struct commit *);
 
 void traverse_commit_list(struct rev_info *revs, show_commit_fn, show_object_fn);