Merge branch 'jk/maint-format-patch-p-suppress-stat'

diff --git a/commit.h b/commit.h
index 011766dee4cc18d33aaf548f4dc7f1bdf09989ac..422f778f3f5b997ea1a3d8569cf6fa573481fff1 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -70,6 +70,7 @@ struct pretty_print_context
        const char *after_subject;
        enum date_mode date_mode;
        int need_8bit_cte;
+       struct reflog_walk_info *reflog_info;
 };
 
 extern int non_ascii(int);
@@ -79,7 +80,7 @@ extern char *reencode_commit_message(const struct commit *commit,
                                     const char **encoding_p);
 extern void get_commit_format(const char *arg, struct rev_info *);
 extern void format_commit_message(const struct commit *commit,
-                                 const void *format, struct strbuf *sb,
+                                 const char *format, struct strbuf *sb,
                                  const struct pretty_print_context *context);
 extern void pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit,
                                struct strbuf *sb,