Merge branch 'bg/send-email-smtpdomain' into maint

diff --git a/commit.h b/commit.h
index 2c0742b721fe1d4d78a7a63ed1c2ee1cf9c96ab8..26ec8c0d1cebcf5e79564be690517cd2eb9c6413 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -74,12 +74,16 @@ struct pretty_print_context
        struct reflog_walk_info *reflog_info;
 };
 
-extern int non_ascii(int);
+struct userformat_want {
+       unsigned notes:1;
+};
+
 extern int has_non_ascii(const char *text);
 struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
 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 userformat_find_requirements(const char *fmt, struct userformat_want *w);
 extern void format_commit_message(const struct commit *commit,
                                  const char *format, struct strbuf *sb,
                                  const struct pretty_print_context *context);