Merge branch 'jk/pretty-subject-cleanup'

[thirdparty/git.git] / pretty.c

diff --git a/pretty.c b/pretty.c
index cf964b060cd128e2bc271c07ed8bb8b4c28bfe29..eecbce82cf83b160a982259619f0ac7e885d17fe 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -1759,7 +1759,7 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
                                goto trailer_out;
                }
                if (*arg == ')') {
-                       format_trailers_from_commit(sb, msg + c->subject_off, &opts);
+                       format_trailers_from_commit(&opts, msg + c->subject_off, sb);
                        ret = arg - placeholder + 1;
                }
        trailer_out:
@@ -2077,11 +2077,11 @@ static void pp_header(struct pretty_print_context *pp,
        }
 }
 
-void pp_title_line(struct pretty_print_context *pp,
-                  const char **msg_p,
-                  struct strbuf *sb,
-                  const char *encoding,
-                  int need_8bit_cte)
+void pp_email_subject(struct pretty_print_context *pp,
+                     const char **msg_p,
+                     struct strbuf *sb,
+                     const char *encoding,
+                     int need_8bit_cte)
 {
        static const int max_length = 78; /* per rfc2047 */
        struct strbuf title;
@@ -2091,19 +2091,14 @@ void pp_title_line(struct pretty_print_context *pp,
                                pp->preserve_subject ? "\n" : " ");
 
        strbuf_grow(sb, title.len + 1024);
-       if (pp->print_email_subject) {
-               if (pp->rev)
-                       fmt_output_email_subject(sb, pp->rev);
-               if (pp->encode_email_headers &&
-                   needs_rfc2047_encoding(title.buf, title.len))
-                       add_rfc2047(sb, title.buf, title.len,
-                                               encoding, RFC2047_SUBJECT);
-               else
-                       strbuf_add_wrapped_bytes(sb, title.buf, title.len,
+       fmt_output_email_subject(sb, pp->rev);
+       if (pp->encode_email_headers &&
+           needs_rfc2047_encoding(title.buf, title.len))
+               add_rfc2047(sb, title.buf, title.len,
+                           encoding, RFC2047_SUBJECT);
+       else
+               strbuf_add_wrapped_bytes(sb, title.buf, title.len,
                                         -last_line_length(sb), 1, max_length);
-       } else {
-               strbuf_addbuf(sb, &title);
-       }
        strbuf_addch(sb, '\n');
 
        if (need_8bit_cte == 0) {
@@ -2126,9 +2121,8 @@ void pp_title_line(struct pretty_print_context *pp,
        if (pp->after_subject) {
                strbuf_addstr(sb, pp->after_subject);
        }
-       if (cmit_fmt_is_mail(pp->fmt)) {
-               strbuf_addch(sb, '\n');
-       }
+
+       strbuf_addch(sb, '\n');
 
        if (pp->in_body_headers.nr) {
                int i;
@@ -2320,7 +2314,7 @@ void pretty_print_commit(struct pretty_print_context *pp,
        }
 
        pp_header(pp, encoding, commit, &msg, sb);
-       if (pp->fmt != CMIT_FMT_ONELINE && !pp->print_email_subject) {
+       if (pp->fmt != CMIT_FMT_ONELINE && !cmit_fmt_is_mail(pp->fmt)) {
                strbuf_addch(sb, '\n');
        }
 
@@ -2328,8 +2322,11 @@ void pretty_print_commit(struct pretty_print_context *pp,
        msg = skip_blank_lines(msg);
 
        /* These formats treat the title line specially. */
-       if (pp->fmt == CMIT_FMT_ONELINE || cmit_fmt_is_mail(pp->fmt))
-               pp_title_line(pp, &msg, sb, encoding, need_8bit_cte);
+       if (pp->fmt == CMIT_FMT_ONELINE) {
+               msg = format_subject(sb, msg, " ");
+               strbuf_addch(sb, '\n');
+       } else if (cmit_fmt_is_mail(pp->fmt))
+               pp_email_subject(pp, &msg, sb, encoding, need_8bit_cte);
 
        beginning_of_body = sb->len;
        if (pp->fmt != CMIT_FMT_ONELINE)