Merge branch 'az/instaweb-py3-http-server'

diff --git a/pretty.h b/pretty.h
index 87ca5dfcbad73fca39e5a8f346bb2cc36996eb80..4ad1fc31ff33408881abf2ea5e28ab813d6c1f85 100644 (file)
--- a/pretty.h
+++ b/pretty.h
@@ -104,9 +104,14 @@ void pp_remainder(struct pretty_print_context *pp, const char **msg_p,
  * Put the result to "sb".
  * Please use this function for custom formats.
  */
-void format_commit_message(const struct commit *commit,
+void repo_format_commit_message(struct repository *r,
+                       const struct commit *commit,
                        const char *format, struct strbuf *sb,
                        const struct pretty_print_context *context);
+#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
+#define format_commit_message(c, f, s, con) \
+       repo_format_commit_message(the_repository, c, f, s, con)
+#endif
 
 /*
  * Parse given arguments from "arg", check it for correctness and