6 #include "string-list.h"
11 static char *user_format
;
13 void get_commit_format(const char *arg
, struct rev_info
*rev
)
16 static struct cmt_fmt_map
{
21 { "raw", 1, CMIT_FMT_RAW
},
22 { "medium", 1, CMIT_FMT_MEDIUM
},
23 { "short", 1, CMIT_FMT_SHORT
},
24 { "email", 1, CMIT_FMT_EMAIL
},
25 { "full", 5, CMIT_FMT_FULL
},
26 { "fuller", 5, CMIT_FMT_FULLER
},
27 { "oneline", 1, CMIT_FMT_ONELINE
},
30 rev
->use_terminator
= 0;
32 rev
->commit_format
= CMIT_FMT_DEFAULT
;
35 if (!prefixcmp(arg
, "format:") || !prefixcmp(arg
, "tformat:")) {
36 const char *cp
= strchr(arg
, ':') + 1;
38 user_format
= xstrdup(cp
);
40 rev
->use_terminator
= 1;
41 rev
->commit_format
= CMIT_FMT_USERFORMAT
;
44 for (i
= 0; i
< ARRAY_SIZE(cmt_fmts
); i
++) {
45 if (!strncmp(arg
, cmt_fmts
[i
].n
, cmt_fmts
[i
].cmp_len
) &&
46 !strncmp(arg
, cmt_fmts
[i
].n
, strlen(arg
))) {
47 if (cmt_fmts
[i
].v
== CMIT_FMT_ONELINE
)
48 rev
->use_terminator
= 1;
49 rev
->commit_format
= cmt_fmts
[i
].v
;
54 die("invalid --pretty format: %s", arg
);
58 * Generic support for pretty-printing the header
60 static int get_one_line(const char *msg
)
75 /* High bit set, or ISO-2022-INT */
79 return ((ch
& 0x80) || (ch
== 0x1b));
82 static int is_rfc2047_special(char ch
)
84 return (non_ascii(ch
) || (ch
== '=') || (ch
== '?') || (ch
== '_'));
87 static void add_rfc2047(struct strbuf
*sb
, const char *line
, int len
,
92 for (i
= 0; i
< len
; i
++) {
96 if ((i
+ 1 < len
) && (ch
== '=' && line
[i
+1] == '?'))
99 strbuf_add(sb
, line
, len
);
103 strbuf_grow(sb
, len
* 3 + strlen(encoding
) + 100);
104 strbuf_addf(sb
, "=?%s?q?", encoding
);
105 for (i
= last
= 0; i
< len
; i
++) {
106 unsigned ch
= line
[i
] & 0xFF;
108 * We encode ' ' using '=20' even though rfc2047
109 * allows using '_' for readability. Unfortunately,
110 * many programs do not understand this and just
111 * leave the underscore in place.
113 if (is_rfc2047_special(ch
) || ch
== ' ') {
114 strbuf_add(sb
, line
+ last
, i
- last
);
115 strbuf_addf(sb
, "=%02X", ch
);
119 strbuf_add(sb
, line
+ last
, len
- last
);
120 strbuf_addstr(sb
, "?=");
123 void pp_user_info(const char *what
, enum cmit_fmt fmt
, struct strbuf
*sb
,
124 const char *line
, enum date_mode dmode
,
125 const char *encoding
)
131 const char *filler
= " ";
133 if (fmt
== CMIT_FMT_ONELINE
)
135 date
= strchr(line
, '>');
138 namelen
= ++date
- line
;
139 time
= strtoul(date
, &date
, 10);
140 tz
= strtol(date
, NULL
, 10);
142 if (fmt
== CMIT_FMT_EMAIL
) {
143 char *name_tail
= strchr(line
, '<');
144 int display_name_length
;
147 while (line
< name_tail
&& isspace(name_tail
[-1]))
149 display_name_length
= name_tail
- line
;
151 strbuf_addstr(sb
, "From: ");
152 add_rfc2047(sb
, line
, display_name_length
, encoding
);
153 strbuf_add(sb
, name_tail
, namelen
- display_name_length
);
154 strbuf_addch(sb
, '\n');
156 strbuf_addf(sb
, "%s: %.*s%.*s\n", what
,
157 (fmt
== CMIT_FMT_FULLER
) ? 4 : 0,
158 filler
, namelen
, line
);
161 case CMIT_FMT_MEDIUM
:
162 strbuf_addf(sb
, "Date: %s\n", show_date(time
, tz
, dmode
));
165 strbuf_addf(sb
, "Date: %s\n", show_date(time
, tz
, DATE_RFC2822
));
167 case CMIT_FMT_FULLER
:
168 strbuf_addf(sb
, "%sDate: %s\n", what
, show_date(time
, tz
, dmode
));
176 static int is_empty_line(const char *line
, int *len_p
)
179 while (len
&& isspace(line
[len
-1]))
185 static const char *skip_empty_lines(const char *msg
)
188 int linelen
= get_one_line(msg
);
192 if (!is_empty_line(msg
, &ll
))
199 static void add_merge_info(enum cmit_fmt fmt
, struct strbuf
*sb
,
200 const struct commit
*commit
, int abbrev
)
202 struct commit_list
*parent
= commit
->parents
;
204 if ((fmt
== CMIT_FMT_ONELINE
) || (fmt
== CMIT_FMT_EMAIL
) ||
205 !parent
|| !parent
->next
)
208 strbuf_addstr(sb
, "Merge:");
211 struct commit
*p
= parent
->item
;
212 const char *hex
= NULL
;
215 hex
= find_unique_abbrev(p
->object
.sha1
, abbrev
);
217 hex
= sha1_to_hex(p
->object
.sha1
);
218 dots
= (abbrev
&& strlen(hex
) != 40) ? "..." : "";
219 parent
= parent
->next
;
221 strbuf_addf(sb
, " %s%s", hex
, dots
);
223 strbuf_addch(sb
, '\n');
226 static char *get_header(const struct commit
*commit
, const char *key
)
228 int key_len
= strlen(key
);
229 const char *line
= commit
->buffer
;
232 const char *eol
= strchr(line
, '\n'), *next
;
237 eol
= line
+ strlen(line
);
241 if (eol
- line
> key_len
&&
242 !strncmp(line
, key
, key_len
) &&
243 line
[key_len
] == ' ') {
244 return xmemdupz(line
+ key_len
+ 1, eol
- line
- key_len
- 1);
250 static char *replace_encoding_header(char *buf
, const char *encoding
)
252 struct strbuf tmp
= STRBUF_INIT
;
256 /* guess if there is an encoding header before a \n\n */
257 while (strncmp(cp
, "encoding ", strlen("encoding "))) {
258 cp
= strchr(cp
, '\n');
259 if (!cp
|| *++cp
== '\n')
263 cp
= strchr(cp
, '\n');
265 return buf
; /* should not happen but be defensive */
266 len
= cp
+ 1 - (buf
+ start
);
268 strbuf_attach(&tmp
, buf
, strlen(buf
), strlen(buf
) + 1);
269 if (is_encoding_utf8(encoding
)) {
270 /* we have re-coded to UTF-8; drop the header */
271 strbuf_remove(&tmp
, start
, len
);
273 /* just replaces XXXX in 'encoding XXXX\n' */
274 strbuf_splice(&tmp
, start
+ strlen("encoding "),
275 len
- strlen("encoding \n"),
276 encoding
, strlen(encoding
));
278 return strbuf_detach(&tmp
, NULL
);
281 static char *logmsg_reencode(const struct commit
*commit
,
282 const char *output_encoding
)
284 static const char *utf8
= "utf-8";
285 const char *use_encoding
;
289 if (!*output_encoding
)
291 encoding
= get_header(commit
, "encoding");
292 use_encoding
= encoding
? encoding
: utf8
;
293 if (!strcmp(use_encoding
, output_encoding
))
294 if (encoding
) /* we'll strip encoding header later */
295 out
= xstrdup(commit
->buffer
);
297 return NULL
; /* nothing to do */
299 out
= reencode_string(commit
->buffer
,
300 output_encoding
, use_encoding
);
302 out
= replace_encoding_header(out
, output_encoding
);
308 static int mailmap_name(char *email
, int email_len
, char *name
, int name_len
)
310 static struct string_list
*mail_map
;
312 mail_map
= xcalloc(1, sizeof(*mail_map
));
313 read_mailmap(mail_map
, NULL
);
315 return mail_map
->nr
&& map_user(mail_map
, email
, email_len
, name
, name_len
);
318 static size_t format_person_part(struct strbuf
*sb
, char part
,
319 const char *msg
, int len
, enum date_mode dmode
)
321 /* currently all placeholders have same length */
322 const int placeholder_len
= 2;
323 int start
, end
, tz
= 0;
324 unsigned long date
= 0;
326 const char *name_start
, *name_end
, *mail_start
, *mail_end
, *msg_end
= msg
+len
;
327 char person_name
[1024];
328 char person_mail
[1024];
330 /* advance 'end' to point to email start delimiter */
331 for (end
= 0; end
< len
&& msg
[end
] != '<'; end
++)
335 * When end points at the '<' that we found, it should have
336 * matching '>' later, which means 'end' must be strictly
342 /* Seek for both name and email part */
345 while (name_end
> name_start
&& isspace(*(name_end
-1)))
347 mail_start
= msg
+end
+1;
348 mail_end
= mail_start
;
349 while (mail_end
< msg_end
&& *mail_end
!= '>')
351 if (mail_end
== msg_end
)
355 if (part
== 'N' || part
== 'E') { /* mailmap lookup */
356 strlcpy(person_name
, name_start
, name_end
-name_start
+1);
357 strlcpy(person_mail
, mail_start
, mail_end
-mail_start
+1);
358 mailmap_name(person_mail
, sizeof(person_mail
), person_name
, sizeof(person_name
));
359 name_start
= person_name
;
360 name_end
= name_start
+ strlen(person_name
);
361 mail_start
= person_mail
;
362 mail_end
= mail_start
+ strlen(person_mail
);
364 if (part
== 'n' || part
== 'N') { /* name */
365 strbuf_add(sb
, name_start
, name_end
-name_start
);
366 return placeholder_len
;
368 if (part
== 'e' || part
== 'E') { /* email */
369 strbuf_add(sb
, mail_start
, mail_end
-mail_start
);
370 return placeholder_len
;
373 /* advance 'start' to point to date start delimiter */
374 for (start
= end
+ 1; start
< len
&& isspace(msg
[start
]); start
++)
378 date
= strtoul(msg
+ start
, &ep
, 10);
379 if (msg
+ start
== ep
)
382 if (part
== 't') { /* date, UNIX timestamp */
383 strbuf_add(sb
, msg
+ start
, ep
- (msg
+ start
));
384 return placeholder_len
;
388 for (start
= ep
- msg
+ 1; start
< len
&& isspace(msg
[start
]); start
++)
390 if (start
+ 1 < len
) {
391 tz
= strtoul(msg
+ start
+ 1, NULL
, 10);
392 if (msg
[start
] == '-')
398 strbuf_addstr(sb
, show_date(date
, tz
, dmode
));
399 return placeholder_len
;
400 case 'D': /* date, RFC2822 style */
401 strbuf_addstr(sb
, show_date(date
, tz
, DATE_RFC2822
));
402 return placeholder_len
;
403 case 'r': /* date, relative */
404 strbuf_addstr(sb
, show_date(date
, tz
, DATE_RELATIVE
));
405 return placeholder_len
;
406 case 'i': /* date, ISO 8601 */
407 strbuf_addstr(sb
, show_date(date
, tz
, DATE_ISO8601
));
408 return placeholder_len
;
413 * bogus commit, 'sb' cannot be updated, but we still need to
414 * compute a valid return value.
416 if (part
== 'n' || part
== 'e' || part
== 't' || part
== 'd'
417 || part
== 'D' || part
== 'r' || part
== 'i')
418 return placeholder_len
;
420 return 0; /* unknown placeholder */
428 struct format_commit_context
{
429 const struct commit
*commit
;
430 enum date_mode dmode
;
431 unsigned commit_header_parsed
:1;
432 unsigned commit_message_parsed
:1;
434 /* These offsets are relative to the start of the commit message. */
436 struct chunk committer
;
437 struct chunk encoding
;
442 /* The following ones are relative to the result struct strbuf. */
443 struct chunk abbrev_commit_hash
;
444 struct chunk abbrev_tree_hash
;
445 struct chunk abbrev_parent_hashes
;
448 static int add_again(struct strbuf
*sb
, struct chunk
*chunk
)
451 strbuf_adddup(sb
, chunk
->off
, chunk
->len
);
456 * We haven't seen this chunk before. Our caller is surely
457 * going to add it the hard way now. Remember the most likely
458 * start of the to-be-added chunk: the current end of the
461 chunk
->off
= sb
->len
;
465 static void parse_commit_header(struct format_commit_context
*context
)
467 const char *msg
= context
->commit
->buffer
;
470 for (i
= 0; msg
[i
]; i
++) {
472 for (eol
= i
; msg
[eol
] && msg
[eol
] != '\n'; eol
++)
477 } else if (!prefixcmp(msg
+ i
, "author ")) {
478 context
->author
.off
= i
+ 7;
479 context
->author
.len
= eol
- i
- 7;
480 } else if (!prefixcmp(msg
+ i
, "committer ")) {
481 context
->committer
.off
= i
+ 10;
482 context
->committer
.len
= eol
- i
- 10;
483 } else if (!prefixcmp(msg
+ i
, "encoding ")) {
484 context
->encoding
.off
= i
+ 9;
485 context
->encoding
.len
= eol
- i
- 9;
489 context
->message_off
= i
;
490 context
->commit_header_parsed
= 1;
493 const char *format_subject(struct strbuf
*sb
, const char *msg
,
494 const char *line_separator
)
499 const char *line
= msg
;
500 int linelen
= get_one_line(line
);
503 if (!linelen
|| is_empty_line(line
, &linelen
))
508 strbuf_grow(sb
, linelen
+ 2);
510 strbuf_addstr(sb
, line_separator
);
511 strbuf_add(sb
, line
, linelen
);
517 static void parse_commit_message(struct format_commit_context
*c
)
519 const char *msg
= c
->commit
->buffer
+ c
->message_off
;
520 const char *start
= c
->commit
->buffer
;
522 msg
= skip_empty_lines(msg
);
523 c
->subject_off
= msg
- start
;
525 msg
= format_subject(NULL
, msg
, NULL
);
526 msg
= skip_empty_lines(msg
);
527 c
->body_off
= msg
- start
;
529 c
->commit_message_parsed
= 1;
532 static void format_decoration(struct strbuf
*sb
, const struct commit
*commit
)
534 struct name_decoration
*d
;
535 const char *prefix
= " (";
537 load_ref_decorations();
538 d
= lookup_decoration(&name_decoration
, &commit
->object
);
540 strbuf_addstr(sb
, prefix
);
542 strbuf_addstr(sb
, d
->name
);
545 if (prefix
[0] == ',')
546 strbuf_addch(sb
, ')');
549 static size_t format_commit_item(struct strbuf
*sb
, const char *placeholder
,
552 struct format_commit_context
*c
= context
;
553 const struct commit
*commit
= c
->commit
;
554 const char *msg
= commit
->buffer
;
555 struct commit_list
*p
;
558 /* these are independent of the commit */
559 switch (placeholder
[0]) {
561 if (placeholder
[1] == '(') {
562 const char *end
= strchr(placeholder
+ 2, ')');
563 char color
[COLOR_MAXLEN
];
566 color_parse_mem(placeholder
+ 2,
567 end
- (placeholder
+ 2),
568 "--pretty format", color
);
569 strbuf_addstr(sb
, color
);
570 return end
- placeholder
+ 1;
572 if (!prefixcmp(placeholder
+ 1, "red")) {
573 strbuf_addstr(sb
, "\033[31m");
575 } else if (!prefixcmp(placeholder
+ 1, "green")) {
576 strbuf_addstr(sb
, "\033[32m");
578 } else if (!prefixcmp(placeholder
+ 1, "blue")) {
579 strbuf_addstr(sb
, "\033[34m");
581 } else if (!prefixcmp(placeholder
+ 1, "reset")) {
582 strbuf_addstr(sb
, "\033[m");
586 case 'n': /* newline */
587 strbuf_addch(sb
, '\n');
590 /* %x00 == NUL, %x0a == LF, etc. */
591 if (0 <= (h1
= hexval_table
[0xff & placeholder
[1]]) &&
593 0 <= (h2
= hexval_table
[0xff & placeholder
[2]]) &&
595 strbuf_addch(sb
, (h1
<<4)|h2
);
601 /* these depend on the commit */
602 if (!commit
->object
.parsed
)
603 parse_object(commit
->object
.sha1
);
605 switch (placeholder
[0]) {
606 case 'H': /* commit hash */
607 strbuf_addstr(sb
, sha1_to_hex(commit
->object
.sha1
));
609 case 'h': /* abbreviated commit hash */
610 if (add_again(sb
, &c
->abbrev_commit_hash
))
612 strbuf_addstr(sb
, find_unique_abbrev(commit
->object
.sha1
,
614 c
->abbrev_commit_hash
.len
= sb
->len
- c
->abbrev_commit_hash
.off
;
616 case 'T': /* tree hash */
617 strbuf_addstr(sb
, sha1_to_hex(commit
->tree
->object
.sha1
));
619 case 't': /* abbreviated tree hash */
620 if (add_again(sb
, &c
->abbrev_tree_hash
))
622 strbuf_addstr(sb
, find_unique_abbrev(commit
->tree
->object
.sha1
,
624 c
->abbrev_tree_hash
.len
= sb
->len
- c
->abbrev_tree_hash
.off
;
626 case 'P': /* parent hashes */
627 for (p
= commit
->parents
; p
; p
= p
->next
) {
628 if (p
!= commit
->parents
)
629 strbuf_addch(sb
, ' ');
630 strbuf_addstr(sb
, sha1_to_hex(p
->item
->object
.sha1
));
633 case 'p': /* abbreviated parent hashes */
634 if (add_again(sb
, &c
->abbrev_parent_hashes
))
636 for (p
= commit
->parents
; p
; p
= p
->next
) {
637 if (p
!= commit
->parents
)
638 strbuf_addch(sb
, ' ');
639 strbuf_addstr(sb
, find_unique_abbrev(
640 p
->item
->object
.sha1
, DEFAULT_ABBREV
));
642 c
->abbrev_parent_hashes
.len
= sb
->len
-
643 c
->abbrev_parent_hashes
.off
;
645 case 'm': /* left/right/bottom */
646 strbuf_addch(sb
, (commit
->object
.flags
& BOUNDARY
)
648 : (commit
->object
.flags
& SYMMETRIC_LEFT
)
653 format_decoration(sb
, commit
);
657 /* For the rest we have to parse the commit header. */
658 if (!c
->commit_header_parsed
)
659 parse_commit_header(c
);
661 switch (placeholder
[0]) {
662 case 'a': /* author ... */
663 return format_person_part(sb
, placeholder
[1],
664 msg
+ c
->author
.off
, c
->author
.len
,
666 case 'c': /* committer ... */
667 return format_person_part(sb
, placeholder
[1],
668 msg
+ c
->committer
.off
, c
->committer
.len
,
670 case 'e': /* encoding */
671 strbuf_add(sb
, msg
+ c
->encoding
.off
, c
->encoding
.len
);
675 /* Now we need to parse the commit message. */
676 if (!c
->commit_message_parsed
)
677 parse_commit_message(c
);
679 switch (placeholder
[0]) {
680 case 's': /* subject */
681 format_subject(sb
, msg
+ c
->subject_off
, " ");
684 strbuf_addstr(sb
, msg
+ c
->body_off
);
687 return 0; /* unknown placeholder */
690 void format_commit_message(const struct commit
*commit
,
691 const void *format
, struct strbuf
*sb
,
692 enum date_mode dmode
)
694 struct format_commit_context context
;
696 memset(&context
, 0, sizeof(context
));
697 context
.commit
= commit
;
698 context
.dmode
= dmode
;
699 strbuf_expand(sb
, format
, format_commit_item
, &context
);
702 static void pp_header(enum cmit_fmt fmt
,
704 enum date_mode dmode
,
705 const char *encoding
,
706 const struct commit
*commit
,
710 int parents_shown
= 0;
713 const char *line
= *msg_p
;
714 int linelen
= get_one_line(*msg_p
);
724 if (fmt
== CMIT_FMT_RAW
) {
725 strbuf_add(sb
, line
, linelen
);
729 if (!memcmp(line
, "parent ", 7)) {
731 die("bad parent line in commit");
735 if (!parents_shown
) {
736 struct commit_list
*parent
;
738 for (parent
= commit
->parents
, num
= 0;
740 parent
= parent
->next
, num
++)
742 /* with enough slop */
743 strbuf_grow(sb
, num
* 50 + 20);
744 add_merge_info(fmt
, sb
, commit
, abbrev
);
749 * MEDIUM == DEFAULT shows only author with dates.
750 * FULL shows both authors but not dates.
751 * FULLER shows both authors and dates.
753 if (!memcmp(line
, "author ", 7)) {
754 strbuf_grow(sb
, linelen
+ 80);
755 pp_user_info("Author", fmt
, sb
, line
+ 7, dmode
, encoding
);
757 if (!memcmp(line
, "committer ", 10) &&
758 (fmt
== CMIT_FMT_FULL
|| fmt
== CMIT_FMT_FULLER
)) {
759 strbuf_grow(sb
, linelen
+ 80);
760 pp_user_info("Commit", fmt
, sb
, line
+ 10, dmode
, encoding
);
765 void pp_title_line(enum cmit_fmt fmt
,
769 const char *after_subject
,
770 const char *encoding
,
773 const char *line_separator
= (fmt
== CMIT_FMT_EMAIL
) ? "\n " : " ";
776 strbuf_init(&title
, 80);
777 *msg_p
= format_subject(&title
, *msg_p
, line_separator
);
779 strbuf_grow(sb
, title
.len
+ 1024);
781 strbuf_addstr(sb
, subject
);
782 add_rfc2047(sb
, title
.buf
, title
.len
, encoding
);
784 strbuf_addbuf(sb
, &title
);
786 strbuf_addch(sb
, '\n');
788 if (need_8bit_cte
> 0) {
789 const char *header_fmt
=
790 "MIME-Version: 1.0\n"
791 "Content-Type: text/plain; charset=%s\n"
792 "Content-Transfer-Encoding: 8bit\n";
793 strbuf_addf(sb
, header_fmt
, encoding
);
796 strbuf_addstr(sb
, after_subject
);
798 if (fmt
== CMIT_FMT_EMAIL
) {
799 strbuf_addch(sb
, '\n');
801 strbuf_release(&title
);
804 void pp_remainder(enum cmit_fmt fmt
,
811 const char *line
= *msg_p
;
812 int linelen
= get_one_line(line
);
818 if (is_empty_line(line
, &linelen
)) {
821 if (fmt
== CMIT_FMT_SHORT
)
826 strbuf_grow(sb
, linelen
+ indent
+ 20);
828 memset(sb
->buf
+ sb
->len
, ' ', indent
);
829 strbuf_setlen(sb
, sb
->len
+ indent
);
831 strbuf_add(sb
, line
, linelen
);
832 strbuf_addch(sb
, '\n');
836 char *reencode_commit_message(const struct commit
*commit
, const char **encoding_p
)
838 const char *encoding
;
840 encoding
= (git_log_output_encoding
841 ? git_log_output_encoding
842 : git_commit_encoding
);
846 *encoding_p
= encoding
;
847 return logmsg_reencode(commit
, encoding
);
850 void pretty_print_commit(enum cmit_fmt fmt
, const struct commit
*commit
,
851 struct strbuf
*sb
, int abbrev
,
852 const char *subject
, const char *after_subject
,
853 enum date_mode dmode
, int need_8bit_cte
)
855 unsigned long beginning_of_body
;
857 const char *msg
= commit
->buffer
;
859 const char *encoding
;
861 if (fmt
== CMIT_FMT_USERFORMAT
) {
862 format_commit_message(commit
, user_format
, sb
, dmode
);
866 reencoded
= reencode_commit_message(commit
, &encoding
);
871 if (fmt
== CMIT_FMT_ONELINE
|| fmt
== CMIT_FMT_EMAIL
)
875 * We need to check and emit Content-type: to mark it
876 * as 8-bit if we haven't done so.
878 if (fmt
== CMIT_FMT_EMAIL
&& need_8bit_cte
== 0) {
881 for (in_body
= i
= 0; (ch
= msg
[i
]); i
++) {
883 /* author could be non 7-bit ASCII but
884 * the log may be so; skip over the
887 if (ch
== '\n' && msg
[i
+1] == '\n')
890 else if (non_ascii(ch
)) {
897 pp_header(fmt
, abbrev
, dmode
, encoding
, commit
, &msg
, sb
);
898 if (fmt
!= CMIT_FMT_ONELINE
&& !subject
) {
899 strbuf_addch(sb
, '\n');
902 /* Skip excess blank lines at the beginning of body, if any... */
903 msg
= skip_empty_lines(msg
);
905 /* These formats treat the title line specially. */
906 if (fmt
== CMIT_FMT_ONELINE
|| fmt
== CMIT_FMT_EMAIL
)
907 pp_title_line(fmt
, &msg
, sb
, subject
,
908 after_subject
, encoding
, need_8bit_cte
);
910 beginning_of_body
= sb
->len
;
911 if (fmt
!= CMIT_FMT_ONELINE
)
912 pp_remainder(fmt
, &msg
, sb
, indent
);
915 /* Make sure there is an EOLN for the non-oneline case */
916 if (fmt
!= CMIT_FMT_ONELINE
)
917 strbuf_addch(sb
, '\n');
920 * The caller may append additional body text in e-mail
921 * format. Make sure we did not strip the blank line
922 * between the header and the body.
924 if (fmt
== CMIT_FMT_EMAIL
&& sb
->len
<= beginning_of_body
)
925 strbuf_addch(sb
, '\n');