diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-03-10 21:24:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-10 21:24:24 (GMT) |
| commit | 0a246106802b147ad81626f52c0aaa37398ba918 (patch) | |
| tree | b15fe8d0ddbbd14775c6fb430a96a80b2404f213 /pretty.c | |
| parent | 44c3f09fa501ccd83e3362080a99ad4b46cda127 (diff) | |
| parent | 6d167fd7ccb84f07a0bd57d8e188a651e913b158 (diff) | |
| download | git-0a246106802b147ad81626f52c0aaa37398ba918.zip git-0a246106802b147ad81626f52c0aaa37398ba918.tar.gz git-0a246106802b147ad81626f52c0aaa37398ba918.tar.bz2 | |
Merge branch 'rs/log-email-subject'
Code clean-up.
* rs/log-email-subject:
pretty: use fmt_output_email_subject()
log-tree: factor out fmt_output_email_subject()
Diffstat (limited to 'pretty.c')
| -rw-r--r-- | pretty.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1607,8 +1607,9 @@ void pp_title_line(struct pretty_print_context *pp, pp->preserve_subject ? "\n" : " "); strbuf_grow(sb, title.len + 1024); - if (pp->subject) { - strbuf_addstr(sb, pp->subject); + if (pp->print_email_subject) { + if (pp->rev) + fmt_output_email_subject(sb, pp->rev); if (needs_rfc2047_encoding(title.buf, title.len, RFC2047_SUBJECT)) add_rfc2047(sb, title.buf, title.len, encoding, RFC2047_SUBJECT); @@ -1818,7 +1819,7 @@ void pretty_print_commit(struct pretty_print_context *pp, } pp_header(pp, encoding, commit, &msg, sb); - if (pp->fmt != CMIT_FMT_ONELINE && !pp->subject) { + if (pp->fmt != CMIT_FMT_ONELINE && !pp->print_email_subject) { strbuf_addch(sb, '\n'); } |