Merge branch 'jt/t5500-unflake'

[thirdparty/git.git] / log-tree.h

diff --git a/log-tree.h b/log-tree.h
index deba035187185bc28a83520b47480c3141d8398e..8fa79289ec6b6cb27e68534845d345caf40137ea 100644 (file)
--- a/log-tree.h
+++ b/log-tree.h
@@ -8,7 +8,9 @@ struct log_info {
 };
 
 struct decoration_filter {
-       struct string_list *include_ref_pattern, *exclude_ref_pattern;
+       struct string_list *include_ref_pattern;
+       struct string_list *exclude_ref_pattern;
+       struct string_list *exclude_ref_config_pattern;
 };
 
 int parse_decorate_color_config(const char *var, const char *slot_name, const char *value);
@@ -27,7 +29,8 @@ void format_decorations_extended(struct strbuf *sb, const struct commit *commit,
 void show_decorations(struct rev_info *opt, struct commit *commit);
 void log_write_email_headers(struct rev_info *opt, struct commit *commit,
                             const char **extra_headers_p,
-                            int *need_8bit_cte_p);
+                            int *need_8bit_cte_p,
+                            int maybe_multipart);
 void load_ref_decorations(struct decoration_filter *filter, int flags);
 
 #define FORMAT_PATCH_NAME_MAX 64