Merge branch 'jk/war-on-sprintf' into maint-2.7

diff --git a/list-objects.h b/list-objects.h
index 136a1da5a6f048c0f4645112cdbf29c7b0982526..0cebf8585cb179ae46fd8238eaf2b2162739bbaa 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 *, void *);
-typedef void (*show_object_fn)(struct object *, const struct name_path *, const char *, void *);
+typedef void (*show_object_fn)(struct object *, const char *, void *);
 void traverse_commit_list(struct rev_info *, show_commit_fn, show_object_fn, void *);
 
 typedef void (*show_edge_fn)(struct commit *);