1#include "cache.h"
2#include "commit.h"
3#include "utf8.h"
4#include "diff.h"
5#include "revision.h"
6#include "string-list.h"
7#include "mailmap.h"
8#include "log-tree.h"
9#include "notes.h"
10#include "color.h"
11#include "reflog-walk.h"
12#include "gpg-interface.h"
13
14static char *user_format;
15static struct cmt_fmt_map {
16 const char *name;
17 enum cmit_fmt format;
18 int is_tformat;
19 int is_alias;
20 const char *user_format;
21} *commit_formats;
22static size_t builtin_formats_len;
23static size_t commit_formats_len;
24static size_t commit_formats_alloc;
25static struct cmt_fmt_map *find_commit_format(const char *sought);
26
27static void save_user_format(struct rev_info *rev, const char *cp, int is_tformat)
28{
29 free(user_format);
30 user_format = xstrdup(cp);
31 if (is_tformat)
32 rev->use_terminator = 1;
33 rev->commit_format = CMIT_FMT_USERFORMAT;
34}
35
36static int git_pretty_formats_config(const char *var, const char *value, void *cb)
37{
38 struct cmt_fmt_map *commit_format = NULL;
39 const char *name;
40 const char *fmt;
41 int i;
42
43 if (prefixcmp(var, "pretty."))
44 return 0;
45
46 name = var + strlen("pretty.");
47 for (i = 0; i < builtin_formats_len; i++) {
48 if (!strcmp(commit_formats[i].name, name))
49 return 0;
50 }
51
52 for (i = builtin_formats_len; i < commit_formats_len; i++) {
53 if (!strcmp(commit_formats[i].name, name)) {
54 commit_format = &commit_formats[i];
55 break;
56 }
57 }
58
59 if (!commit_format) {
60 ALLOC_GROW(commit_formats, commit_formats_len+1,
61 commit_formats_alloc);
62 commit_format = &commit_formats[commit_formats_len];
63 memset(commit_format, 0, sizeof(*commit_format));
64 commit_formats_len++;
65 }
66
67 commit_format->name = xstrdup(name);
68 commit_format->format = CMIT_FMT_USERFORMAT;
69 git_config_string(&fmt, var, value);
70 if (!prefixcmp(fmt, "format:") || !prefixcmp(fmt, "tformat:")) {
71 commit_format->is_tformat = fmt[0] == 't';
72 fmt = strchr(fmt, ':') + 1;
73 } else if (strchr(fmt, '%'))
74 commit_format->is_tformat = 1;
75 else
76 commit_format->is_alias = 1;
77 commit_format->user_format = fmt;
78
79 return 0;
80}
81
82static void setup_commit_formats(void)
83{
84 struct cmt_fmt_map builtin_formats[] = {
85 { "raw", CMIT_FMT_RAW, 0 },
86 { "medium", CMIT_FMT_MEDIUM, 0 },
87 { "short", CMIT_FMT_SHORT, 0 },
88 { "email", CMIT_FMT_EMAIL, 0 },
89 { "fuller", CMIT_FMT_FULLER, 0 },
90 { "full", CMIT_FMT_FULL, 0 },
91 { "oneline", CMIT_FMT_ONELINE, 1 }
92 };
93 commit_formats_len = ARRAY_SIZE(builtin_formats);
94 builtin_formats_len = commit_formats_len;
95 ALLOC_GROW(commit_formats, commit_formats_len, commit_formats_alloc);
96 memcpy(commit_formats, builtin_formats,
97 sizeof(*builtin_formats)*ARRAY_SIZE(builtin_formats));
98
99 git_config(git_pretty_formats_config, NULL);
100}
101
102static struct cmt_fmt_map *find_commit_format_recursive(const char *sought,
103 const char *original,
104 int num_redirections)
105{
106 struct cmt_fmt_map *found = NULL;
107 size_t found_match_len = 0;
108 int i;
109
110 if (num_redirections >= commit_formats_len)
111 die("invalid --pretty format: "
112 "'%s' references an alias which points to itself",
113 original);
114
115 for (i = 0; i < commit_formats_len; i++) {
116 size_t match_len;
117
118 if (prefixcmp(commit_formats[i].name, sought))
119 continue;
120
121 match_len = strlen(commit_formats[i].name);
122 if (found == NULL || found_match_len > match_len) {
123 found = &commit_formats[i];
124 found_match_len = match_len;
125 }
126 }
127
128 if (found && found->is_alias) {
129 found = find_commit_format_recursive(found->user_format,
130 original,
131 num_redirections+1);
132 }
133
134 return found;
135}
136
137static struct cmt_fmt_map *find_commit_format(const char *sought)
138{
139 if (!commit_formats)
140 setup_commit_formats();
141
142 return find_commit_format_recursive(sought, sought, 0);
143}
144
145void get_commit_format(const char *arg, struct rev_info *rev)
146{
147 struct cmt_fmt_map *commit_format;
148
149 rev->use_terminator = 0;
150 if (!arg || !*arg) {
151 rev->commit_format = CMIT_FMT_DEFAULT;
152 return;
153 }
154 if (!prefixcmp(arg, "format:") || !prefixcmp(arg, "tformat:")) {
155 save_user_format(rev, strchr(arg, ':') + 1, arg[0] == 't');
156 return;
157 }
158
159 if (strchr(arg, '%')) {
160 save_user_format(rev, arg, 1);
161 return;
162 }
163
164 commit_format = find_commit_format(arg);
165 if (!commit_format)
166 die("invalid --pretty format: %s", arg);
167
168 rev->commit_format = commit_format->format;
169 rev->use_terminator = commit_format->is_tformat;
170 if (commit_format->format == CMIT_FMT_USERFORMAT) {
171 save_user_format(rev, commit_format->user_format,
172 commit_format->is_tformat);
173 }
174}
175
176/*
177 * Generic support for pretty-printing the header
178 */
179static int get_one_line(const char *msg)
180{
181 int ret = 0;
182
183 for (;;) {
184 char c = *msg++;
185 if (!c)
186 break;
187 ret++;
188 if (c == '\n')
189 break;
190 }
191 return ret;
192}
193
194/* High bit set, or ISO-2022-INT */
195static int non_ascii(int ch)
196{
197 return !isascii(ch) || ch == '\033';
198}
199
200int has_non_ascii(const char *s)
201{
202 int ch;
203 if (!s)
204 return 0;
205 while ((ch = *s++) != '\0') {
206 if (non_ascii(ch))
207 return 1;
208 }
209 return 0;
210}
211
212static int is_rfc822_special(char ch)
213{
214 switch (ch) {
215 case '(':
216 case ')':
217 case '<':
218 case '>':
219 case '[':
220 case ']':
221 case ':':
222 case ';':
223 case '@':
224 case ',':
225 case '.':
226 case '"':
227 case '\\':
228 return 1;
229 default:
230 return 0;
231 }
232}
233
234static int needs_rfc822_quoting(const char *s, int len)
235{
236 int i;
237 for (i = 0; i < len; i++)
238 if (is_rfc822_special(s[i]))
239 return 1;
240 return 0;
241}
242
243static int last_line_length(struct strbuf *sb)
244{
245 int i;
246
247 /* How many bytes are already used on the last line? */
248 for (i = sb->len - 1; i >= 0; i--)
249 if (sb->buf[i] == '\n')
250 break;
251 return sb->len - (i + 1);
252}
253
254static void add_rfc822_quoted(struct strbuf *out, const char *s, int len)
255{
256 int i;
257
258 /* just a guess, we may have to also backslash-quote */
259 strbuf_grow(out, len + 2);
260
261 strbuf_addch(out, '"');
262 for (i = 0; i < len; i++) {
263 switch (s[i]) {
264 case '"':
265 case '\\':
266 strbuf_addch(out, '\\');
267 /* fall through */
268 default:
269 strbuf_addch(out, s[i]);
270 }
271 }
272 strbuf_addch(out, '"');
273}
274
275enum rfc2047_type {
276 RFC2047_SUBJECT,
277 RFC2047_ADDRESS,
278};
279
280static int is_rfc2047_special(char ch, enum rfc2047_type type)
281{
282 /*
283 * rfc2047, section 4.2:
284 *
285 * 8-bit values which correspond to printable ASCII characters other
286 * than "=", "?", and "_" (underscore), MAY be represented as those
287 * characters. (But see section 5 for restrictions.) In
288 * particular, SPACE and TAB MUST NOT be represented as themselves
289 * within encoded words.
290 */
291
292 /*
293 * rule out non-ASCII characters and non-printable characters (the
294 * non-ASCII check should be redundant as isprint() is not localized
295 * and only knows about ASCII, but be defensive about that)
296 */
297 if (non_ascii(ch) || !isprint(ch))
298 return 1;
299
300 /*
301 * rule out special printable characters (' ' should be the only
302 * whitespace character considered printable, but be defensive and use
303 * isspace())
304 */
305 if (isspace(ch) || ch == '=' || ch == '?' || ch == '_')
306 return 1;
307
308 /*
309 * rfc2047, section 5.3:
310 *
311 * As a replacement for a 'word' entity within a 'phrase', for example,
312 * one that precedes an address in a From, To, or Cc header. The ABNF
313 * definition for 'phrase' from RFC 822 thus becomes:
314 *
315 * phrase = 1*( encoded-word / word )
316 *
317 * In this case the set of characters that may be used in a "Q"-encoded
318 * 'encoded-word' is restricted to: <upper and lower case ASCII
319 * letters, decimal digits, "!", "*", "+", "-", "/", "=", and "_"
320 * (underscore, ASCII 95.)>. An 'encoded-word' that appears within a
321 * 'phrase' MUST be separated from any adjacent 'word', 'text' or
322 * 'special' by 'linear-white-space'.
323 */
324
325 if (type != RFC2047_ADDRESS)
326 return 0;
327
328 /* '=' and '_' are special cases and have been checked above */
329 return !(isalnum(ch) || ch == '!' || ch == '*' || ch == '+' || ch == '-' || ch == '/');
330}
331
332static int needs_rfc2047_encoding(const char *line, int len,
333 enum rfc2047_type type)
334{
335 int i;
336
337 for (i = 0; i < len; i++) {
338 int ch = line[i];
339 if (non_ascii(ch) || ch == '\n')
340 return 1;
341 if ((i + 1 < len) && (ch == '=' && line[i+1] == '?'))
342 return 1;
343 }
344
345 return 0;
346}
347
348static void add_rfc2047(struct strbuf *sb, const char *line, size_t len,
349 const char *encoding, enum rfc2047_type type)
350{
351 static const int max_encoded_length = 76; /* per rfc2047 */
352 int i;
353 int line_len = last_line_length(sb);
354
355 strbuf_grow(sb, len * 3 + strlen(encoding) + 100);
356 strbuf_addf(sb, "=?%s?q?", encoding);
357 line_len += strlen(encoding) + 5; /* 5 for =??q? */
358
359 while (len) {
360 /*
361 * RFC 2047, section 5 (3):
362 *
363 * Each 'encoded-word' MUST represent an integral number of
364 * characters. A multi-octet character may not be split across
365 * adjacent 'encoded- word's.
366 */
367 const unsigned char *p = (const unsigned char *)line;
368 int chrlen = mbs_chrlen(&line, &len, encoding);
369 int is_special = (chrlen > 1) || is_rfc2047_special(*p, type);
370
371 /* "=%02X" * chrlen, or the byte itself */
372 const char *encoded_fmt = is_special ? "=%02X" : "%c";
373 int encoded_len = is_special ? 3 * chrlen : 1;
374
375 /*
376 * According to RFC 2047, we could encode the special character
377 * ' ' (space) with '_' (underscore) for readability. But many
378 * programs do not understand this and just leave the
379 * underscore in place. Thus, we do nothing special here, which
380 * causes ' ' to be encoded as '=20', avoiding this problem.
381 */
382
383 if (line_len + encoded_len + 2 > max_encoded_length) {
384 /* It won't fit with trailing "?=" --- break the line */
385 strbuf_addf(sb, "?=\n =?%s?q?", encoding);
386 line_len = strlen(encoding) + 5 + 1; /* =??q? plus SP */
387 }
388
389 for (i = 0; i < chrlen; i++)
390 strbuf_addf(sb, encoded_fmt, p[i]);
391 line_len += encoded_len;
392 }
393 strbuf_addstr(sb, "?=");
394}
395
396void pp_user_info(const struct pretty_print_context *pp,
397 const char *what, struct strbuf *sb,
398 const char *line, const char *encoding)
399{
400 struct strbuf name;
401 struct strbuf mail;
402 struct ident_split ident;
403 int linelen;
404 char *line_end, *date;
405 const char *mailbuf, *namebuf;
406 size_t namelen, maillen;
407 int max_length = 78; /* per rfc2822 */
408 unsigned long time;
409 int tz;
410
411 if (pp->fmt == CMIT_FMT_ONELINE)
412 return;
413
414 line_end = strchr(line, '\n');
415 if (!line_end) {
416 line_end = strchr(line, '\0');
417 if (!line_end)
418 return;
419 }
420
421 linelen = ++line_end - line;
422 if (split_ident_line(&ident, line, linelen))
423 return;
424
425
426 mailbuf = ident.mail_begin;
427 maillen = ident.mail_end - ident.mail_begin;
428 namebuf = ident.name_begin;
429 namelen = ident.name_end - ident.name_begin;
430
431 if (pp->mailmap)
432 map_user(pp->mailmap, &mailbuf, &maillen, &namebuf, &namelen);
433
434 strbuf_init(&mail, 0);
435 strbuf_init(&name, 0);
436
437 strbuf_add(&mail, mailbuf, maillen);
438 strbuf_add(&name, namebuf, namelen);
439
440 namelen = name.len + mail.len + 3; /* ' ' + '<' + '>' */
441 time = strtoul(ident.date_begin, &date, 10);
442 tz = strtol(date, NULL, 10);
443
444 if (pp->fmt == CMIT_FMT_EMAIL) {
445 strbuf_addstr(sb, "From: ");
446 if (needs_rfc2047_encoding(name.buf, name.len, RFC2047_ADDRESS)) {
447 add_rfc2047(sb, name.buf, name.len,
448 encoding, RFC2047_ADDRESS);
449 max_length = 76; /* per rfc2047 */
450 } else if (needs_rfc822_quoting(name.buf, name.len)) {
451 struct strbuf quoted = STRBUF_INIT;
452 add_rfc822_quoted("ed, name.buf, name.len);
453 strbuf_add_wrapped_bytes(sb, quoted.buf, quoted.len,
454 -6, 1, max_length);
455 strbuf_release("ed);
456 } else {
457 strbuf_add_wrapped_bytes(sb, name.buf, name.len,
458 -6, 1, max_length);
459 }
460 if (namelen - name.len + last_line_length(sb) > max_length)
461 strbuf_addch(sb, '\n');
462
463 strbuf_addf(sb, " <%s>\n", mail.buf);
464 } else {
465 strbuf_addf(sb, "%s: %.*s%s <%s>\n", what,
466 (pp->fmt == CMIT_FMT_FULLER) ? 4 : 0,
467 " ", name.buf, mail.buf);
468 }
469
470 strbuf_release(&mail);
471 strbuf_release(&name);
472
473 switch (pp->fmt) {
474 case CMIT_FMT_MEDIUM:
475 strbuf_addf(sb, "Date: %s\n", show_date(time, tz, pp->date_mode));
476 break;
477 case CMIT_FMT_EMAIL:
478 strbuf_addf(sb, "Date: %s\n", show_date(time, tz, DATE_RFC2822));
479 break;
480 case CMIT_FMT_FULLER:
481 strbuf_addf(sb, "%sDate: %s\n", what, show_date(time, tz, pp->date_mode));
482 break;
483 default:
484 /* notin' */
485 break;
486 }
487}
488
489static int is_empty_line(const char *line, int *len_p)
490{
491 int len = *len_p;
492 while (len && isspace(line[len-1]))
493 len--;
494 *len_p = len;
495 return !len;
496}
497
498static const char *skip_empty_lines(const char *msg)
499{
500 for (;;) {
501 int linelen = get_one_line(msg);
502 int ll = linelen;
503 if (!linelen)
504 break;
505 if (!is_empty_line(msg, &ll))
506 break;
507 msg += linelen;
508 }
509 return msg;
510}
511
512static void add_merge_info(const struct pretty_print_context *pp,
513 struct strbuf *sb, const struct commit *commit)
514{
515 struct commit_list *parent = commit->parents;
516
517 if ((pp->fmt == CMIT_FMT_ONELINE) || (pp->fmt == CMIT_FMT_EMAIL) ||
518 !parent || !parent->next)
519 return;
520
521 strbuf_addstr(sb, "Merge:");
522
523 while (parent) {
524 struct commit *p = parent->item;
525 const char *hex = NULL;
526 if (pp->abbrev)
527 hex = find_unique_abbrev(p->object.sha1, pp->abbrev);
528 if (!hex)
529 hex = sha1_to_hex(p->object.sha1);
530 parent = parent->next;
531
532 strbuf_addf(sb, " %s", hex);
533 }
534 strbuf_addch(sb, '\n');
535}
536
537static char *get_header(const struct commit *commit, const char *msg,
538 const char *key)
539{
540 int key_len = strlen(key);
541 const char *line = msg;
542
543 while (line) {
544 const char *eol = strchr(line, '\n'), *next;
545
546 if (line == eol)
547 return NULL;
548 if (!eol) {
549 warning("malformed commit (header is missing newline): %s",
550 sha1_to_hex(commit->object.sha1));
551 eol = line + strlen(line);
552 next = NULL;
553 } else
554 next = eol + 1;
555 if (eol - line > key_len &&
556 !strncmp(line, key, key_len) &&
557 line[key_len] == ' ') {
558 return xmemdupz(line + key_len + 1, eol - line - key_len - 1);
559 }
560 line = next;
561 }
562 return NULL;
563}
564
565static char *replace_encoding_header(char *buf, const char *encoding)
566{
567 struct strbuf tmp = STRBUF_INIT;
568 size_t start, len;
569 char *cp = buf;
570
571 /* guess if there is an encoding header before a \n\n */
572 while (strncmp(cp, "encoding ", strlen("encoding "))) {
573 cp = strchr(cp, '\n');
574 if (!cp || *++cp == '\n')
575 return buf;
576 }
577 start = cp - buf;
578 cp = strchr(cp, '\n');
579 if (!cp)
580 return buf; /* should not happen but be defensive */
581 len = cp + 1 - (buf + start);
582
583 strbuf_attach(&tmp, buf, strlen(buf), strlen(buf) + 1);
584 if (is_encoding_utf8(encoding)) {
585 /* we have re-coded to UTF-8; drop the header */
586 strbuf_remove(&tmp, start, len);
587 } else {
588 /* just replaces XXXX in 'encoding XXXX\n' */
589 strbuf_splice(&tmp, start + strlen("encoding "),
590 len - strlen("encoding \n"),
591 encoding, strlen(encoding));
592 }
593 return strbuf_detach(&tmp, NULL);
594}
595
596char *logmsg_reencode(const struct commit *commit,
597 char **commit_encoding,
598 const char *output_encoding)
599{
600 static const char *utf8 = "UTF-8";
601 const char *use_encoding;
602 char *encoding;
603 char *msg = commit->buffer;
604 char *out;
605
606 if (!msg) {
607 enum object_type type;
608 unsigned long size;
609
610 msg = read_sha1_file(commit->object.sha1, &type, &size);
611 if (!msg)
612 die("Cannot read commit object %s",
613 sha1_to_hex(commit->object.sha1));
614 if (type != OBJ_COMMIT)
615 die("Expected commit for '%s', got %s",
616 sha1_to_hex(commit->object.sha1), typename(type));
617 }
618
619 if (!output_encoding || !*output_encoding) {
620 if (commit_encoding)
621 *commit_encoding =
622 get_header(commit, msg, "encoding");
623 return msg;
624 }
625 encoding = get_header(commit, msg, "encoding");
626 if (commit_encoding)
627 *commit_encoding = encoding;
628 use_encoding = encoding ? encoding : utf8;
629 if (same_encoding(use_encoding, output_encoding)) {
630 /*
631 * No encoding work to be done. If we have no encoding header
632 * at all, then there's nothing to do, and we can return the
633 * message verbatim (whether newly allocated or not).
634 */
635 if (!encoding)
636 return msg;
637
638 /*
639 * Otherwise, we still want to munge the encoding header in the
640 * result, which will be done by modifying the buffer. If we
641 * are using a fresh copy, we can reuse it. But if we are using
642 * the cached copy from commit->buffer, we need to duplicate it
643 * to avoid munging commit->buffer.
644 */
645 out = msg;
646 if (out == commit->buffer)
647 out = xstrdup(out);
648 }
649 else {
650 /*
651 * There's actual encoding work to do. Do the reencoding, which
652 * still leaves the header to be replaced in the next step. At
653 * this point, we are done with msg. If we allocated a fresh
654 * copy, we can free it.
655 */
656 out = reencode_string(msg, output_encoding, use_encoding);
657 if (out && msg != commit->buffer)
658 free(msg);
659 }
660
661 /*
662 * This replacement actually consumes the buffer we hand it, so we do
663 * not have to worry about freeing the old "out" here.
664 */
665 if (out)
666 out = replace_encoding_header(out, output_encoding);
667
668 if (!commit_encoding)
669 free(encoding);
670 /*
671 * If the re-encoding failed, out might be NULL here; in that
672 * case we just return the commit message verbatim.
673 */
674 return out ? out : msg;
675}
676
677void logmsg_free(char *msg, const struct commit *commit)
678{
679 if (msg != commit->buffer)
680 free(msg);
681}
682
683static int mailmap_name(const char **email, size_t *email_len,
684 const char **name, size_t *name_len)
685{
686 static struct string_list *mail_map;
687 if (!mail_map) {
688 mail_map = xcalloc(1, sizeof(*mail_map));
689 read_mailmap(mail_map, NULL);
690 }
691 return mail_map->nr && map_user(mail_map, email, email_len, name, name_len);
692}
693
694static size_t format_person_part(struct strbuf *sb, char part,
695 const char *msg, int len, enum date_mode dmode)
696{
697 /* currently all placeholders have same length */
698 const int placeholder_len = 2;
699 int tz;
700 unsigned long date = 0;
701 struct ident_split s;
702 const char *name, *mail;
703 size_t maillen, namelen;
704
705 if (split_ident_line(&s, msg, len) < 0)
706 goto skip;
707
708 name = s.name_begin;
709 namelen = s.name_end - s.name_begin;
710 mail = s.mail_begin;
711 maillen = s.mail_end - s.mail_begin;
712
713 if (part == 'N' || part == 'E') /* mailmap lookup */
714 mailmap_name(&mail, &maillen, &name, &namelen);
715 if (part == 'n' || part == 'N') { /* name */
716 strbuf_add(sb, name, namelen);
717 return placeholder_len;
718 }
719 if (part == 'e' || part == 'E') { /* email */
720 strbuf_add(sb, mail, maillen);
721 return placeholder_len;
722 }
723
724 if (!s.date_begin)
725 goto skip;
726
727 date = strtoul(s.date_begin, NULL, 10);
728
729 if (part == 't') { /* date, UNIX timestamp */
730 strbuf_add(sb, s.date_begin, s.date_end - s.date_begin);
731 return placeholder_len;
732 }
733
734 /* parse tz */
735 tz = strtoul(s.tz_begin + 1, NULL, 10);
736 if (*s.tz_begin == '-')
737 tz = -tz;
738
739 switch (part) {
740 case 'd': /* date */
741 strbuf_addstr(sb, show_date(date, tz, dmode));
742 return placeholder_len;
743 case 'D': /* date, RFC2822 style */
744 strbuf_addstr(sb, show_date(date, tz, DATE_RFC2822));
745 return placeholder_len;
746 case 'r': /* date, relative */
747 strbuf_addstr(sb, show_date(date, tz, DATE_RELATIVE));
748 return placeholder_len;
749 case 'i': /* date, ISO 8601 */
750 strbuf_addstr(sb, show_date(date, tz, DATE_ISO8601));
751 return placeholder_len;
752 }
753
754skip:
755 /*
756 * reading from either a bogus commit, or a reflog entry with
757 * %gn, %ge, etc.; 'sb' cannot be updated, but we still need
758 * to compute a valid return value.
759 */
760 if (part == 'n' || part == 'e' || part == 't' || part == 'd'
761 || part == 'D' || part == 'r' || part == 'i')
762 return placeholder_len;
763
764 return 0; /* unknown placeholder */
765}
766
767struct chunk {
768 size_t off;
769 size_t len;
770};
771
772struct format_commit_context {
773 const struct commit *commit;
774 const struct pretty_print_context *pretty_ctx;
775 unsigned commit_header_parsed:1;
776 unsigned commit_message_parsed:1;
777 struct signature_check signature_check;
778 char *message;
779 char *commit_encoding;
780 size_t width, indent1, indent2;
781
782 /* These offsets are relative to the start of the commit message. */
783 struct chunk author;
784 struct chunk committer;
785 size_t message_off;
786 size_t subject_off;
787 size_t body_off;
788
789 /* The following ones are relative to the result struct strbuf. */
790 struct chunk abbrev_commit_hash;
791 struct chunk abbrev_tree_hash;
792 struct chunk abbrev_parent_hashes;
793 size_t wrap_start;
794};
795
796static int add_again(struct strbuf *sb, struct chunk *chunk)
797{
798 if (chunk->len) {
799 strbuf_adddup(sb, chunk->off, chunk->len);
800 return 1;
801 }
802
803 /*
804 * We haven't seen this chunk before. Our caller is surely
805 * going to add it the hard way now. Remember the most likely
806 * start of the to-be-added chunk: the current end of the
807 * struct strbuf.
808 */
809 chunk->off = sb->len;
810 return 0;
811}
812
813static void parse_commit_header(struct format_commit_context *context)
814{
815 const char *msg = context->message;
816 int i;
817
818 for (i = 0; msg[i]; i++) {
819 int eol;
820 for (eol = i; msg[eol] && msg[eol] != '\n'; eol++)
821 ; /* do nothing */
822
823 if (i == eol) {
824 break;
825 } else if (!prefixcmp(msg + i, "author ")) {
826 context->author.off = i + 7;
827 context->author.len = eol - i - 7;
828 } else if (!prefixcmp(msg + i, "committer ")) {
829 context->committer.off = i + 10;
830 context->committer.len = eol - i - 10;
831 }
832 i = eol;
833 }
834 context->message_off = i;
835 context->commit_header_parsed = 1;
836}
837
838static int istitlechar(char c)
839{
840 return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
841 (c >= '0' && c <= '9') || c == '.' || c == '_';
842}
843
844static void format_sanitized_subject(struct strbuf *sb, const char *msg)
845{
846 size_t trimlen;
847 size_t start_len = sb->len;
848 int space = 2;
849
850 for (; *msg && *msg != '\n'; msg++) {
851 if (istitlechar(*msg)) {
852 if (space == 1)
853 strbuf_addch(sb, '-');
854 space = 0;
855 strbuf_addch(sb, *msg);
856 if (*msg == '.')
857 while (*(msg+1) == '.')
858 msg++;
859 } else
860 space |= 1;
861 }
862
863 /* trim any trailing '.' or '-' characters */
864 trimlen = 0;
865 while (sb->len - trimlen > start_len &&
866 (sb->buf[sb->len - 1 - trimlen] == '.'
867 || sb->buf[sb->len - 1 - trimlen] == '-'))
868 trimlen++;
869 strbuf_remove(sb, sb->len - trimlen, trimlen);
870}
871
872const char *format_subject(struct strbuf *sb, const char *msg,
873 const char *line_separator)
874{
875 int first = 1;
876
877 for (;;) {
878 const char *line = msg;
879 int linelen = get_one_line(line);
880
881 msg += linelen;
882 if (!linelen || is_empty_line(line, &linelen))
883 break;
884
885 if (!sb)
886 continue;
887 strbuf_grow(sb, linelen + 2);
888 if (!first)
889 strbuf_addstr(sb, line_separator);
890 strbuf_add(sb, line, linelen);
891 first = 0;
892 }
893 return msg;
894}
895
896static void parse_commit_message(struct format_commit_context *c)
897{
898 const char *msg = c->message + c->message_off;
899 const char *start = c->message;
900
901 msg = skip_empty_lines(msg);
902 c->subject_off = msg - start;
903
904 msg = format_subject(NULL, msg, NULL);
905 msg = skip_empty_lines(msg);
906 c->body_off = msg - start;
907
908 c->commit_message_parsed = 1;
909}
910
911static void strbuf_wrap(struct strbuf *sb, size_t pos,
912 size_t width, size_t indent1, size_t indent2)
913{
914 struct strbuf tmp = STRBUF_INIT;
915
916 if (pos)
917 strbuf_add(&tmp, sb->buf, pos);
918 strbuf_add_wrapped_text(&tmp, sb->buf + pos,
919 (int) indent1, (int) indent2, (int) width);
920 strbuf_swap(&tmp, sb);
921 strbuf_release(&tmp);
922}
923
924static void rewrap_message_tail(struct strbuf *sb,
925 struct format_commit_context *c,
926 size_t new_width, size_t new_indent1,
927 size_t new_indent2)
928{
929 if (c->width == new_width && c->indent1 == new_indent1 &&
930 c->indent2 == new_indent2)
931 return;
932 if (c->wrap_start < sb->len)
933 strbuf_wrap(sb, c->wrap_start, c->width, c->indent1, c->indent2);
934 c->wrap_start = sb->len;
935 c->width = new_width;
936 c->indent1 = new_indent1;
937 c->indent2 = new_indent2;
938}
939
940static int format_reflog_person(struct strbuf *sb,
941 char part,
942 struct reflog_walk_info *log,
943 enum date_mode dmode)
944{
945 const char *ident;
946
947 if (!log)
948 return 2;
949
950 ident = get_reflog_ident(log);
951 if (!ident)
952 return 2;
953
954 return format_person_part(sb, part, ident, strlen(ident), dmode);
955}
956
957static size_t parse_color(struct strbuf *sb, /* in UTF-8 */
958 const char *placeholder,
959 struct format_commit_context *c)
960{
961 if (placeholder[1] == '(') {
962 const char *begin = placeholder + 2;
963 const char *end = strchr(begin, ')');
964 char color[COLOR_MAXLEN];
965
966 if (!end)
967 return 0;
968 if (!prefixcmp(begin, "auto,")) {
969 if (!want_color(c->pretty_ctx->color))
970 return end - placeholder + 1;
971 begin += 5;
972 }
973 color_parse_mem(begin,
974 end - begin,
975 "--pretty format", color);
976 strbuf_addstr(sb, color);
977 return end - placeholder + 1;
978 }
979 if (!prefixcmp(placeholder + 1, "red")) {
980 strbuf_addstr(sb, GIT_COLOR_RED);
981 return 4;
982 } else if (!prefixcmp(placeholder + 1, "green")) {
983 strbuf_addstr(sb, GIT_COLOR_GREEN);
984 return 6;
985 } else if (!prefixcmp(placeholder + 1, "blue")) {
986 strbuf_addstr(sb, GIT_COLOR_BLUE);
987 return 5;
988 } else if (!prefixcmp(placeholder + 1, "reset")) {
989 strbuf_addstr(sb, GIT_COLOR_RESET);
990 return 6;
991 } else
992 return 0;
993}
994
995static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
996 const char *placeholder,
997 void *context)
998{
999 struct format_commit_context *c = context;
1000 const struct commit *commit = c->commit;
1001 const char *msg = c->message;
1002 struct commit_list *p;
1003 int h1, h2;
1004
1005 /* these are independent of the commit */
1006 switch (placeholder[0]) {
1007 case 'C':
1008 return parse_color(sb, placeholder, c);
1009 case 'n': /* newline */
1010 strbuf_addch(sb, '\n');
1011 return 1;
1012 case 'x':
1013 /* %x00 == NUL, %x0a == LF, etc. */
1014 if (0 <= (h1 = hexval_table[0xff & placeholder[1]]) &&
1015 h1 <= 16 &&
1016 0 <= (h2 = hexval_table[0xff & placeholder[2]]) &&
1017 h2 <= 16) {
1018 strbuf_addch(sb, (h1<<4)|h2);
1019 return 3;
1020 } else
1021 return 0;
1022 case 'w':
1023 if (placeholder[1] == '(') {
1024 unsigned long width = 0, indent1 = 0, indent2 = 0;
1025 char *next;
1026 const char *start = placeholder + 2;
1027 const char *end = strchr(start, ')');
1028 if (!end)
1029 return 0;
1030 if (end > start) {
1031 width = strtoul(start, &next, 10);
1032 if (*next == ',') {
1033 indent1 = strtoul(next + 1, &next, 10);
1034 if (*next == ',') {
1035 indent2 = strtoul(next + 1,
1036 &next, 10);
1037 }
1038 }
1039 if (*next != ')')
1040 return 0;
1041 }
1042 rewrap_message_tail(sb, c, width, indent1, indent2);
1043 return end - placeholder + 1;
1044 } else
1045 return 0;
1046 }
1047
1048 /* these depend on the commit */
1049 if (!commit->object.parsed)
1050 parse_object(commit->object.sha1);
1051
1052 switch (placeholder[0]) {
1053 case 'H': /* commit hash */
1054 strbuf_addstr(sb, sha1_to_hex(commit->object.sha1));
1055 return 1;
1056 case 'h': /* abbreviated commit hash */
1057 if (add_again(sb, &c->abbrev_commit_hash))
1058 return 1;
1059 strbuf_addstr(sb, find_unique_abbrev(commit->object.sha1,
1060 c->pretty_ctx->abbrev));
1061 c->abbrev_commit_hash.len = sb->len - c->abbrev_commit_hash.off;
1062 return 1;
1063 case 'T': /* tree hash */
1064 strbuf_addstr(sb, sha1_to_hex(commit->tree->object.sha1));
1065 return 1;
1066 case 't': /* abbreviated tree hash */
1067 if (add_again(sb, &c->abbrev_tree_hash))
1068 return 1;
1069 strbuf_addstr(sb, find_unique_abbrev(commit->tree->object.sha1,
1070 c->pretty_ctx->abbrev));
1071 c->abbrev_tree_hash.len = sb->len - c->abbrev_tree_hash.off;
1072 return 1;
1073 case 'P': /* parent hashes */
1074 for (p = commit->parents; p; p = p->next) {
1075 if (p != commit->parents)
1076 strbuf_addch(sb, ' ');
1077 strbuf_addstr(sb, sha1_to_hex(p->item->object.sha1));
1078 }
1079 return 1;
1080 case 'p': /* abbreviated parent hashes */
1081 if (add_again(sb, &c->abbrev_parent_hashes))
1082 return 1;
1083 for (p = commit->parents; p; p = p->next) {
1084 if (p != commit->parents)
1085 strbuf_addch(sb, ' ');
1086 strbuf_addstr(sb, find_unique_abbrev(
1087 p->item->object.sha1,
1088 c->pretty_ctx->abbrev));
1089 }
1090 c->abbrev_parent_hashes.len = sb->len -
1091 c->abbrev_parent_hashes.off;
1092 return 1;
1093 case 'm': /* left/right/bottom */
1094 strbuf_addstr(sb, get_revision_mark(NULL, commit));
1095 return 1;
1096 case 'd':
1097 load_ref_decorations(DECORATE_SHORT_REFS);
1098 format_decorations(sb, commit, 0);
1099 return 1;
1100 case 'g': /* reflog info */
1101 switch(placeholder[1]) {
1102 case 'd': /* reflog selector */
1103 case 'D':
1104 if (c->pretty_ctx->reflog_info)
1105 get_reflog_selector(sb,
1106 c->pretty_ctx->reflog_info,
1107 c->pretty_ctx->date_mode,
1108 c->pretty_ctx->date_mode_explicit,
1109 (placeholder[1] == 'd'));
1110 return 2;
1111 case 's': /* reflog message */
1112 if (c->pretty_ctx->reflog_info)
1113 get_reflog_message(sb, c->pretty_ctx->reflog_info);
1114 return 2;
1115 case 'n':
1116 case 'N':
1117 case 'e':
1118 case 'E':
1119 return format_reflog_person(sb,
1120 placeholder[1],
1121 c->pretty_ctx->reflog_info,
1122 c->pretty_ctx->date_mode);
1123 }
1124 return 0; /* unknown %g placeholder */
1125 case 'N':
1126 if (c->pretty_ctx->notes_message) {
1127 strbuf_addstr(sb, c->pretty_ctx->notes_message);
1128 return 1;
1129 }
1130 return 0;
1131 }
1132
1133 if (placeholder[0] == 'G') {
1134 if (!c->signature_check.result)
1135 check_commit_signature(c->commit, &(c->signature_check));
1136 switch (placeholder[1]) {
1137 case 'G':
1138 if (c->signature_check.gpg_output)
1139 strbuf_addstr(sb, c->signature_check.gpg_output);
1140 break;
1141 case '?':
1142 switch (c->signature_check.result) {
1143 case 'G':
1144 case 'B':
1145 case 'U':
1146 case 'N':
1147 strbuf_addch(sb, c->signature_check.result);
1148 }
1149 break;
1150 case 'S':
1151 if (c->signature_check.signer)
1152 strbuf_addstr(sb, c->signature_check.signer);
1153 break;
1154 case 'K':
1155 if (c->signature_check.key)
1156 strbuf_addstr(sb, c->signature_check.key);
1157 break;
1158 }
1159 return 2;
1160 }
1161
1162
1163 /* For the rest we have to parse the commit header. */
1164 if (!c->commit_header_parsed)
1165 parse_commit_header(c);
1166
1167 switch (placeholder[0]) {
1168 case 'a': /* author ... */
1169 return format_person_part(sb, placeholder[1],
1170 msg + c->author.off, c->author.len,
1171 c->pretty_ctx->date_mode);
1172 case 'c': /* committer ... */
1173 return format_person_part(sb, placeholder[1],
1174 msg + c->committer.off, c->committer.len,
1175 c->pretty_ctx->date_mode);
1176 case 'e': /* encoding */
1177 if (c->commit_encoding)
1178 strbuf_addstr(sb, c->commit_encoding);
1179 return 1;
1180 case 'B': /* raw body */
1181 /* message_off is always left at the initial newline */
1182 strbuf_addstr(sb, msg + c->message_off + 1);
1183 return 1;
1184 }
1185
1186 /* Now we need to parse the commit message. */
1187 if (!c->commit_message_parsed)
1188 parse_commit_message(c);
1189
1190 switch (placeholder[0]) {
1191 case 's': /* subject */
1192 format_subject(sb, msg + c->subject_off, " ");
1193 return 1;
1194 case 'f': /* sanitized subject */
1195 format_sanitized_subject(sb, msg + c->subject_off);
1196 return 1;
1197 case 'b': /* body */
1198 strbuf_addstr(sb, msg + c->body_off);
1199 return 1;
1200 }
1201 return 0; /* unknown placeholder */
1202}
1203
1204static size_t format_commit_item(struct strbuf *sb, /* in UTF-8 */
1205 const char *placeholder,
1206 void *context)
1207{
1208 int consumed;
1209 size_t orig_len;
1210 enum {
1211 NO_MAGIC,
1212 ADD_LF_BEFORE_NON_EMPTY,
1213 DEL_LF_BEFORE_EMPTY,
1214 ADD_SP_BEFORE_NON_EMPTY
1215 } magic = NO_MAGIC;
1216
1217 switch (placeholder[0]) {
1218 case '-':
1219 magic = DEL_LF_BEFORE_EMPTY;
1220 break;
1221 case '+':
1222 magic = ADD_LF_BEFORE_NON_EMPTY;
1223 break;
1224 case ' ':
1225 magic = ADD_SP_BEFORE_NON_EMPTY;
1226 break;
1227 default:
1228 break;
1229 }
1230 if (magic != NO_MAGIC)
1231 placeholder++;
1232
1233 orig_len = sb->len;
1234 consumed = format_commit_one(sb, placeholder, context);
1235 if (magic == NO_MAGIC)
1236 return consumed;
1237
1238 if ((orig_len == sb->len) && magic == DEL_LF_BEFORE_EMPTY) {
1239 while (sb->len && sb->buf[sb->len - 1] == '\n')
1240 strbuf_setlen(sb, sb->len - 1);
1241 } else if (orig_len != sb->len) {
1242 if (magic == ADD_LF_BEFORE_NON_EMPTY)
1243 strbuf_insert(sb, orig_len, "\n", 1);
1244 else if (magic == ADD_SP_BEFORE_NON_EMPTY)
1245 strbuf_insert(sb, orig_len, " ", 1);
1246 }
1247 return consumed + 1;
1248}
1249
1250static size_t userformat_want_item(struct strbuf *sb, const char *placeholder,
1251 void *context)
1252{
1253 struct userformat_want *w = context;
1254
1255 if (*placeholder == '+' || *placeholder == '-' || *placeholder == ' ')
1256 placeholder++;
1257
1258 switch (*placeholder) {
1259 case 'N':
1260 w->notes = 1;
1261 break;
1262 }
1263 return 0;
1264}
1265
1266void userformat_find_requirements(const char *fmt, struct userformat_want *w)
1267{
1268 struct strbuf dummy = STRBUF_INIT;
1269
1270 if (!fmt) {
1271 if (!user_format)
1272 return;
1273 fmt = user_format;
1274 }
1275 strbuf_expand(&dummy, fmt, userformat_want_item, w);
1276 strbuf_release(&dummy);
1277}
1278
1279void format_commit_message(const struct commit *commit,
1280 const char *format, struct strbuf *sb,
1281 const struct pretty_print_context *pretty_ctx)
1282{
1283 struct format_commit_context context;
1284 const char *output_enc = pretty_ctx->output_encoding;
1285 const char *utf8 = "UTF-8";
1286
1287 memset(&context, 0, sizeof(context));
1288 context.commit = commit;
1289 context.pretty_ctx = pretty_ctx;
1290 context.wrap_start = sb->len;
1291 context.message = logmsg_reencode(commit,
1292 &context.commit_encoding,
1293 output_enc);
1294
1295 strbuf_expand(sb, format, format_commit_item, &context);
1296 rewrap_message_tail(sb, &context, 0, 0, 0);
1297
1298 if (output_enc) {
1299 if (same_encoding(utf8, output_enc))
1300 output_enc = NULL;
1301 } else {
1302 if (context.commit_encoding &&
1303 !same_encoding(context.commit_encoding, utf8))
1304 output_enc = context.commit_encoding;
1305 }
1306
1307 if (output_enc) {
1308 int outsz;
1309 char *out = reencode_string_len(sb->buf, sb->len,
1310 output_enc, utf8, &outsz);
1311 if (out)
1312 strbuf_attach(sb, out, outsz, outsz + 1);
1313 }
1314
1315 free(context.commit_encoding);
1316 logmsg_free(context.message, commit);
1317 free(context.signature_check.gpg_output);
1318 free(context.signature_check.signer);
1319}
1320
1321static void pp_header(const struct pretty_print_context *pp,
1322 const char *encoding,
1323 const struct commit *commit,
1324 const char **msg_p,
1325 struct strbuf *sb)
1326{
1327 int parents_shown = 0;
1328
1329 for (;;) {
1330 const char *line = *msg_p;
1331 int linelen = get_one_line(*msg_p);
1332
1333 if (!linelen)
1334 return;
1335 *msg_p += linelen;
1336
1337 if (linelen == 1)
1338 /* End of header */
1339 return;
1340
1341 if (pp->fmt == CMIT_FMT_RAW) {
1342 strbuf_add(sb, line, linelen);
1343 continue;
1344 }
1345
1346 if (!prefixcmp(line, "parent ")) {
1347 if (linelen != 48)
1348 die("bad parent line in commit");
1349 continue;
1350 }
1351
1352 if (!parents_shown) {
1353 struct commit_list *parent;
1354 int num;
1355 for (parent = commit->parents, num = 0;
1356 parent;
1357 parent = parent->next, num++)
1358 ;
1359 /* with enough slop */
1360 strbuf_grow(sb, num * 50 + 20);
1361 add_merge_info(pp, sb, commit);
1362 parents_shown = 1;
1363 }
1364
1365 /*
1366 * MEDIUM == DEFAULT shows only author with dates.
1367 * FULL shows both authors but not dates.
1368 * FULLER shows both authors and dates.
1369 */
1370 if (!prefixcmp(line, "author ")) {
1371 strbuf_grow(sb, linelen + 80);
1372 pp_user_info(pp, "Author", sb, line + 7, encoding);
1373 }
1374 if (!prefixcmp(line, "committer ") &&
1375 (pp->fmt == CMIT_FMT_FULL || pp->fmt == CMIT_FMT_FULLER)) {
1376 strbuf_grow(sb, linelen + 80);
1377 pp_user_info(pp, "Commit", sb, line + 10, encoding);
1378 }
1379 }
1380}
1381
1382void pp_title_line(const struct pretty_print_context *pp,
1383 const char **msg_p,
1384 struct strbuf *sb,
1385 const char *encoding,
1386 int need_8bit_cte)
1387{
1388 static const int max_length = 78; /* per rfc2047 */
1389 struct strbuf title;
1390
1391 strbuf_init(&title, 80);
1392 *msg_p = format_subject(&title, *msg_p,
1393 pp->preserve_subject ? "\n" : " ");
1394
1395 strbuf_grow(sb, title.len + 1024);
1396 if (pp->subject) {
1397 strbuf_addstr(sb, pp->subject);
1398 if (needs_rfc2047_encoding(title.buf, title.len, RFC2047_SUBJECT))
1399 add_rfc2047(sb, title.buf, title.len,
1400 encoding, RFC2047_SUBJECT);
1401 else
1402 strbuf_add_wrapped_bytes(sb, title.buf, title.len,
1403 -last_line_length(sb), 1, max_length);
1404 } else {
1405 strbuf_addbuf(sb, &title);
1406 }
1407 strbuf_addch(sb, '\n');
1408
1409 if (need_8bit_cte > 0) {
1410 const char *header_fmt =
1411 "MIME-Version: 1.0\n"
1412 "Content-Type: text/plain; charset=%s\n"
1413 "Content-Transfer-Encoding: 8bit\n";
1414 strbuf_addf(sb, header_fmt, encoding);
1415 }
1416 if (pp->after_subject) {
1417 strbuf_addstr(sb, pp->after_subject);
1418 }
1419 if (pp->fmt == CMIT_FMT_EMAIL) {
1420 strbuf_addch(sb, '\n');
1421 }
1422 strbuf_release(&title);
1423}
1424
1425void pp_remainder(const struct pretty_print_context *pp,
1426 const char **msg_p,
1427 struct strbuf *sb,
1428 int indent)
1429{
1430 int first = 1;
1431 for (;;) {
1432 const char *line = *msg_p;
1433 int linelen = get_one_line(line);
1434 *msg_p += linelen;
1435
1436 if (!linelen)
1437 break;
1438
1439 if (is_empty_line(line, &linelen)) {
1440 if (first)
1441 continue;
1442 if (pp->fmt == CMIT_FMT_SHORT)
1443 break;
1444 }
1445 first = 0;
1446
1447 strbuf_grow(sb, linelen + indent + 20);
1448 if (indent) {
1449 memset(sb->buf + sb->len, ' ', indent);
1450 strbuf_setlen(sb, sb->len + indent);
1451 }
1452 strbuf_add(sb, line, linelen);
1453 strbuf_addch(sb, '\n');
1454 }
1455}
1456
1457void pretty_print_commit(const struct pretty_print_context *pp,
1458 const struct commit *commit,
1459 struct strbuf *sb)
1460{
1461 unsigned long beginning_of_body;
1462 int indent = 4;
1463 const char *msg;
1464 char *reencoded;
1465 const char *encoding;
1466 int need_8bit_cte = pp->need_8bit_cte;
1467
1468 if (pp->fmt == CMIT_FMT_USERFORMAT) {
1469 format_commit_message(commit, user_format, sb, pp);
1470 return;
1471 }
1472
1473 encoding = get_log_output_encoding();
1474 msg = reencoded = logmsg_reencode(commit, NULL, encoding);
1475
1476 if (pp->fmt == CMIT_FMT_ONELINE || pp->fmt == CMIT_FMT_EMAIL)
1477 indent = 0;
1478
1479 /*
1480 * We need to check and emit Content-type: to mark it
1481 * as 8-bit if we haven't done so.
1482 */
1483 if (pp->fmt == CMIT_FMT_EMAIL && need_8bit_cte == 0) {
1484 int i, ch, in_body;
1485
1486 for (in_body = i = 0; (ch = msg[i]); i++) {
1487 if (!in_body) {
1488 /* author could be non 7-bit ASCII but
1489 * the log may be so; skip over the
1490 * header part first.
1491 */
1492 if (ch == '\n' && msg[i+1] == '\n')
1493 in_body = 1;
1494 }
1495 else if (non_ascii(ch)) {
1496 need_8bit_cte = 1;
1497 break;
1498 }
1499 }
1500 }
1501
1502 pp_header(pp, encoding, commit, &msg, sb);
1503 if (pp->fmt != CMIT_FMT_ONELINE && !pp->subject) {
1504 strbuf_addch(sb, '\n');
1505 }
1506
1507 /* Skip excess blank lines at the beginning of body, if any... */
1508 msg = skip_empty_lines(msg);
1509
1510 /* These formats treat the title line specially. */
1511 if (pp->fmt == CMIT_FMT_ONELINE || pp->fmt == CMIT_FMT_EMAIL)
1512 pp_title_line(pp, &msg, sb, encoding, need_8bit_cte);
1513
1514 beginning_of_body = sb->len;
1515 if (pp->fmt != CMIT_FMT_ONELINE)
1516 pp_remainder(pp, &msg, sb, indent);
1517 strbuf_rtrim(sb);
1518
1519 /* Make sure there is an EOLN for the non-oneline case */
1520 if (pp->fmt != CMIT_FMT_ONELINE)
1521 strbuf_addch(sb, '\n');
1522
1523 /*
1524 * The caller may append additional body text in e-mail
1525 * format. Make sure we did not strip the blank line
1526 * between the header and the body.
1527 */
1528 if (pp->fmt == CMIT_FMT_EMAIL && sb->len <= beginning_of_body)
1529 strbuf_addch(sb, '\n');
1530
1531 logmsg_free(reencoded, commit);
1532}
1533
1534void pp_commit_easy(enum cmit_fmt fmt, const struct commit *commit,
1535 struct strbuf *sb)
1536{
1537 struct pretty_print_context pp = {0};
1538 pp.fmt = fmt;
1539 pretty_print_commit(&pp, commit, sb);
1540}