pretty: drop print_email_subject flag

With one exception, the print_email_subject flag is set if and only if the commit format is email based: - in make_cover_letter() we set it along with CMIT_FMT_EMAIL explicitly - in show_log(), we set it if cmit_fmt_is_mail() is true. That covers format-patch as well as "git log --format=email" (or mboxrd). The one exception is "rev-list --format=email", which somewhat nonsensically prints the author and date as email headers, but no subject, like: $ git rev-list --format=email HEAD commit 64fc4c2cdd4db2645eaabb47aa4bac820b03cdba From: Jeff King <peff@peff.net> Date: Tue, 19 Mar 2024 19:39:26 -0400 this is the subject this is the body It's doubtful that this is a useful format at all (the "commit" lines replace the "From" lines that would make it work as an actual mbox). But I think that printing the subject as a header (like this patch does) is the least surprising thing to do. So let's drop this field, making the code a little simpler and easier to reason about. Note that we do need to set the "rev" field of the pretty_print_context in rev-list, since that is used to check for subject_prefix, etc. It's not possible to set those fields via rev-list, so we'll always just print "Subject: ". But unless we pass in our rev_info, fmt_output_email_subject() would segfault trying to figure it out. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Mar 19, 2024 at 20:30 UTC d5a90d6319aeb6cb3f0b795156c4c2259373424f
5 files changed +9 -16
builtin/log.c
-1
@@ -1364,7 +1364,6 @@ static void make_cover_letter(struct rev_info *rev, int use_separate_file,
1364 pp.fmt = CMIT_FMT_EMAIL;
1365 pp.date_mode.type = DATE_RFC2822;
1366 pp.rev = rev;
1367 - pp.print_email_subject = 1;
1367 pp.encode_email_headers = rev->encode_email_headers;
1368 pp_user_info(&pp, NULL, &sb, committer, encoding);
1369 prepare_cover_text(&pp, description_file, branch_name, &sb,
builtin/rev-list.c
+1
@@ -219,6 +219,7 @@ static void show_commit(struct commit *commit, void *data)
219 ctx.fmt = revs->commit_format;
220 ctx.output_encoding = get_log_output_encoding();
221 ctx.color = revs->diffopt.use_color;
222 + ctx.rev = revs;
223 pretty_print_commit(&ctx, commit, &buf);
224 if (buf.len) {
225 if (revs->commit_format != CMIT_FMT_ONELINE)
log-tree.c
-1
@@ -742,7 +742,6 @@ void show_log(struct rev_info *opt)
742 log_write_email_headers(opt, commit, &extra_headers,
743 &ctx.need_8bit_cte, 1);
744 ctx.rev = opt;
745 - ctx.print_email_subject = 1;
745 } else if (opt->commit_format != CMIT_FMT_USERFORMAT) {
746 fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), opt->diffopt.file);
747 if (opt->commit_format != CMIT_FMT_ONELINE)
pretty.c
+8 -13
@@ -2091,19 +2091,14 @@ void pp_email_subject(struct pretty_print_context *pp,
2091 pp->preserve_subject ? "\n" : " ");
2092
2093 strbuf_grow(sb, title.len + 1024);
2094 - if (pp->print_email_subject) {
2095 - if (pp->rev)
2096 - fmt_output_email_subject(sb, pp->rev);
2097 - if (pp->encode_email_headers &&
2098 - needs_rfc2047_encoding(title.buf, title.len))
2099 - add_rfc2047(sb, title.buf, title.len,
2100 - encoding, RFC2047_SUBJECT);
2101 - else
2102 - strbuf_add_wrapped_bytes(sb, title.buf, title.len,
2094 + fmt_output_email_subject(sb, pp->rev);
2095 + if (pp->encode_email_headers &&
2096 + needs_rfc2047_encoding(title.buf, title.len))
2097 + add_rfc2047(sb, title.buf, title.len,
2098 + encoding, RFC2047_SUBJECT);
2099 + else
2100 + strbuf_add_wrapped_bytes(sb, title.buf, title.len,
2101 -last_line_length(sb), 1, max_length);
2104 - } else {
2105 - strbuf_addbuf(sb, &title);
2106 - }
2102 strbuf_addch(sb, '\n');
2103
2104 if (need_8bit_cte == 0) {
@@ -2319,7 +2314,7 @@ void pretty_print_commit(struct pretty_print_context *pp,
2314 }
2315
2316 pp_header(pp, encoding, commit, &msg, sb);
2322 - if (pp->fmt != CMIT_FMT_ONELINE && !pp->print_email_subject) {
2317 + if (pp->fmt != CMIT_FMT_ONELINE && !cmit_fmt_is_mail(pp->fmt)) {
2318 strbuf_addch(sb, '\n');
2319 }
2320
pretty.h
-1
@@ -39,7 +39,6 @@ struct pretty_print_context {
39 int preserve_subject;
40 struct date_mode date_mode;
41 unsigned date_mode_explicit:1;
42 - int print_email_subject;
42 int expand_tabs_in_log;
43 int need_8bit_cte;
44 char *notes_message;