Merge branch 'ss/commit-squash-msg' into maint

diff --git a/revision.h b/revision.h
index 7beab15248f696a165a51cbe683000d3ede85939..dca0d381715cf5bc6888587feaec989012f51252 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -259,8 +259,7 @@ extern void mark_tree_uninteresting(struct tree *tree);
 
 char *path_name(struct strbuf *path, const char *name);
 
-extern void show_object_with_name(FILE *, struct object *,
-                                 struct strbuf *, const char *);
+extern void show_object_with_name(FILE *, struct object *, const char *);
 
 extern void add_pending_object(struct rev_info *revs,
                               struct object *obj, const char *name);