Merge branch 'maint'

* maint:
  format-patch: generate MIME header as needed even when there is format.header
diff --git a/log-tree.h b/log-tree.h
index 0cc9344..8946ff3 100644
--- a/log-tree.h
+++ b/log-tree.h
@@ -14,6 +14,8 @@
 void show_log(struct rev_info *opt, const char *sep);
 void show_decorations(struct commit *commit);
 void log_write_email_headers(struct rev_info *opt, const char *name,
-			     const char **subject_p, const char **extra_headers_p);
+			     const char **subject_p,
+			     const char **extra_headers_p,
+			     int *need_8bit_cte_p);
 
 #endif