ceed6b62e6c0dea3e367d7aabc79605e497140d4
1#include "cache.h"
2#include "diff.h"
3#include "commit.h"
4#include "tag.h"
5#include "graph.h"
6#include "log-tree.h"
7#include "reflog-walk.h"
8#include "refs.h"
9#include "string-list.h"
10#include "color.h"
11#include "gpg-interface.h"
12
13struct decoration name_decoration = { "object names" };
14
15enum decoration_type {
16 DECORATION_NONE = 0,
17 DECORATION_REF_LOCAL,
18 DECORATION_REF_REMOTE,
19 DECORATION_REF_TAG,
20 DECORATION_REF_STASH,
21 DECORATION_REF_HEAD,
22 DECORATION_GRAFTED,
23};
24
25static char decoration_colors[][COLOR_MAXLEN] = {
26 GIT_COLOR_RESET,
27 GIT_COLOR_BOLD_GREEN, /* REF_LOCAL */
28 GIT_COLOR_BOLD_RED, /* REF_REMOTE */
29 GIT_COLOR_BOLD_YELLOW, /* REF_TAG */
30 GIT_COLOR_BOLD_MAGENTA, /* REF_STASH */
31 GIT_COLOR_BOLD_CYAN, /* REF_HEAD */
32 GIT_COLOR_BOLD_BLUE, /* GRAFTED */
33};
34
35static const char *decorate_get_color(int decorate_use_color, enum decoration_type ix)
36{
37 if (want_color(decorate_use_color))
38 return decoration_colors[ix];
39 return "";
40}
41
42static int parse_decorate_color_slot(const char *slot)
43{
44 /*
45 * We're comparing with 'ignore-case' on
46 * (because config.c sets them all tolower),
47 * but let's match the letters in the literal
48 * string values here with how they are
49 * documented in Documentation/config.txt, for
50 * consistency.
51 *
52 * We love being consistent, don't we?
53 */
54 if (!strcasecmp(slot, "branch"))
55 return DECORATION_REF_LOCAL;
56 if (!strcasecmp(slot, "remoteBranch"))
57 return DECORATION_REF_REMOTE;
58 if (!strcasecmp(slot, "tag"))
59 return DECORATION_REF_TAG;
60 if (!strcasecmp(slot, "stash"))
61 return DECORATION_REF_STASH;
62 if (!strcasecmp(slot, "HEAD"))
63 return DECORATION_REF_HEAD;
64 return -1;
65}
66
67int parse_decorate_color_config(const char *var, const int ofs, const char *value)
68{
69 int slot = parse_decorate_color_slot(var + ofs);
70 if (slot < 0)
71 return 0;
72 if (!value)
73 return config_error_nonbool(var);
74 color_parse(value, var, decoration_colors[slot]);
75 return 0;
76}
77
78/*
79 * log-tree.c uses DIFF_OPT_TST for determining whether to use color
80 * for showing the commit sha1, use the same check for --decorate
81 */
82#define decorate_get_color_opt(o, ix) \
83 decorate_get_color((o)->use_color, ix)
84
85static void add_name_decoration(enum decoration_type type, const char *name, struct object *obj)
86{
87 int nlen = strlen(name);
88 struct name_decoration *res = xmalloc(sizeof(struct name_decoration) + nlen);
89 memcpy(res->name, name, nlen + 1);
90 res->type = type;
91 res->next = add_decoration(&name_decoration, obj, res);
92}
93
94static int add_ref_decoration(const char *refname, const unsigned char *sha1, int flags, void *cb_data)
95{
96 struct object *obj;
97 enum decoration_type type = DECORATION_NONE;
98
99 if (!prefixcmp(refname, "refs/replace/")) {
100 unsigned char original_sha1[20];
101 if (!read_replace_refs)
102 return 0;
103 if (get_sha1_hex(refname + 13, original_sha1)) {
104 warning("invalid replace ref %s", refname);
105 return 0;
106 }
107 obj = parse_object(original_sha1);
108 if (obj)
109 add_name_decoration(DECORATION_GRAFTED, "replaced", obj);
110 return 0;
111 }
112
113 obj = parse_object(sha1);
114 if (!obj)
115 return 0;
116
117 if (!prefixcmp(refname, "refs/heads/"))
118 type = DECORATION_REF_LOCAL;
119 else if (!prefixcmp(refname, "refs/remotes/"))
120 type = DECORATION_REF_REMOTE;
121 else if (!prefixcmp(refname, "refs/tags/"))
122 type = DECORATION_REF_TAG;
123 else if (!strcmp(refname, "refs/stash"))
124 type = DECORATION_REF_STASH;
125 else if (!strcmp(refname, "HEAD"))
126 type = DECORATION_REF_HEAD;
127
128 if (!cb_data || *(int *)cb_data == DECORATE_SHORT_REFS)
129 refname = prettify_refname(refname);
130 add_name_decoration(type, refname, obj);
131 while (obj->type == OBJ_TAG) {
132 obj = ((struct tag *)obj)->tagged;
133 if (!obj)
134 break;
135 add_name_decoration(DECORATION_REF_TAG, refname, obj);
136 }
137 return 0;
138}
139
140static int add_graft_decoration(const struct commit_graft *graft, void *cb_data)
141{
142 struct commit *commit = lookup_commit(graft->sha1);
143 if (!commit)
144 return 0;
145 add_name_decoration(DECORATION_GRAFTED, "grafted", &commit->object);
146 return 0;
147}
148
149void load_ref_decorations(int flags)
150{
151 static int loaded;
152 if (!loaded) {
153 loaded = 1;
154 for_each_ref(add_ref_decoration, &flags);
155 head_ref(add_ref_decoration, &flags);
156 for_each_commit_graft(add_graft_decoration, NULL);
157 }
158}
159
160static void show_parents(struct commit *commit, int abbrev)
161{
162 struct commit_list *p;
163 for (p = commit->parents; p ; p = p->next) {
164 struct commit *parent = p->item;
165 printf(" %s", find_unique_abbrev(parent->object.sha1, abbrev));
166 }
167}
168
169static void show_children(struct rev_info *opt, struct commit *commit, int abbrev)
170{
171 struct commit_list *p = lookup_decoration(&opt->children, &commit->object);
172 for ( ; p; p = p->next) {
173 printf(" %s", find_unique_abbrev(p->item->object.sha1, abbrev));
174 }
175}
176
177void show_decorations(struct rev_info *opt, struct commit *commit)
178{
179 const char *prefix;
180 struct name_decoration *decoration;
181 const char *color_commit =
182 diff_get_color_opt(&opt->diffopt, DIFF_COMMIT);
183 const char *color_reset =
184 decorate_get_color_opt(&opt->diffopt, DECORATION_NONE);
185
186 if (opt->show_source && commit->util)
187 printf("\t%s", (char *) commit->util);
188 if (!opt->show_decorations)
189 return;
190 decoration = lookup_decoration(&name_decoration, &commit->object);
191 if (!decoration)
192 return;
193 prefix = " (";
194 while (decoration) {
195 printf("%s", prefix);
196 fputs(decorate_get_color_opt(&opt->diffopt, decoration->type),
197 stdout);
198 if (decoration->type == DECORATION_REF_TAG)
199 fputs("tag: ", stdout);
200 printf("%s", decoration->name);
201 fputs(color_reset, stdout);
202 fputs(color_commit, stdout);
203 prefix = ", ";
204 decoration = decoration->next;
205 }
206 putchar(')');
207}
208
209/*
210 * Search for "^[-A-Za-z]+: [^@]+@" pattern. It usually matches
211 * Signed-off-by: and Acked-by: lines.
212 */
213static int detect_any_signoff(char *letter, int size)
214{
215 char *cp;
216 int seen_colon = 0;
217 int seen_at = 0;
218 int seen_name = 0;
219 int seen_head = 0;
220
221 cp = letter + size;
222 while (letter <= --cp && *cp == '\n')
223 continue;
224
225 while (letter <= cp) {
226 char ch = *cp--;
227 if (ch == '\n')
228 break;
229
230 if (!seen_at) {
231 if (ch == '@')
232 seen_at = 1;
233 continue;
234 }
235 if (!seen_colon) {
236 if (ch == '@')
237 return 0;
238 else if (ch == ':')
239 seen_colon = 1;
240 else
241 seen_name = 1;
242 continue;
243 }
244 if (('A' <= ch && ch <= 'Z') ||
245 ('a' <= ch && ch <= 'z') ||
246 ch == '-') {
247 seen_head = 1;
248 continue;
249 }
250 /* no empty last line doesn't match */
251 return 0;
252 }
253 return seen_head && seen_name;
254}
255
256static void append_signoff(struct strbuf *sb, const char *signoff)
257{
258 static const char signed_off_by[] = "Signed-off-by: ";
259 size_t signoff_len = strlen(signoff);
260 int has_signoff = 0;
261 char *cp;
262
263 cp = sb->buf;
264
265 /* First see if we already have the sign-off by the signer */
266 while ((cp = strstr(cp, signed_off_by))) {
267
268 has_signoff = 1;
269
270 cp += strlen(signed_off_by);
271 if (cp + signoff_len >= sb->buf + sb->len)
272 break;
273 if (strncmp(cp, signoff, signoff_len))
274 continue;
275 if (!isspace(cp[signoff_len]))
276 continue;
277 /* we already have him */
278 return;
279 }
280
281 if (!has_signoff)
282 has_signoff = detect_any_signoff(sb->buf, sb->len);
283
284 if (!has_signoff)
285 strbuf_addch(sb, '\n');
286
287 strbuf_addstr(sb, signed_off_by);
288 strbuf_add(sb, signoff, signoff_len);
289 strbuf_addch(sb, '\n');
290}
291
292static unsigned int digits_in_number(unsigned int number)
293{
294 unsigned int i = 10, result = 1;
295 while (i <= number) {
296 i *= 10;
297 result++;
298 }
299 return result;
300}
301
302void get_patch_filename(struct strbuf *buf,
303 struct commit *commit, const char *subject,
304 struct rev_info *info)
305{
306 const char *suffix = info->patch_suffix;
307 int nr = info->nr;
308 int suffix_len = strlen(suffix) + 1;
309 int start_len = buf->len;
310
311 strbuf_addf(buf, commit || subject ? "%04d-" : "%d", nr);
312 if (commit || subject) {
313 int max_len = start_len + FORMAT_PATCH_NAME_MAX - suffix_len;
314 struct pretty_print_context ctx = {0};
315
316 if (subject)
317 strbuf_addstr(buf, subject);
318 else if (commit)
319 format_commit_message(commit, "%f", buf, &ctx);
320
321 if (max_len < buf->len)
322 strbuf_setlen(buf, max_len);
323 strbuf_addstr(buf, suffix);
324 }
325}
326
327void log_write_email_headers(struct rev_info *opt, struct commit *commit,
328 const char **subject_p,
329 const char **extra_headers_p,
330 int *need_8bit_cte_p)
331{
332 const char *subject = NULL;
333 const char *extra_headers = opt->extra_headers;
334 const char *name = sha1_to_hex(commit->object.sha1);
335
336 *need_8bit_cte_p = 0; /* unknown */
337 if (opt->total > 0) {
338 static char buffer[64];
339 snprintf(buffer, sizeof(buffer),
340 "Subject: [%s%s%0*d/%d] ",
341 opt->subject_prefix,
342 *opt->subject_prefix ? " " : "",
343 digits_in_number(opt->total),
344 opt->nr, opt->total);
345 subject = buffer;
346 } else if (opt->total == 0 && opt->subject_prefix && *opt->subject_prefix) {
347 static char buffer[256];
348 snprintf(buffer, sizeof(buffer),
349 "Subject: [%s] ",
350 opt->subject_prefix);
351 subject = buffer;
352 } else {
353 subject = "Subject: ";
354 }
355
356 printf("From %s Mon Sep 17 00:00:00 2001\n", name);
357 graph_show_oneline(opt->graph);
358 if (opt->message_id) {
359 printf("Message-Id: <%s>\n", opt->message_id);
360 graph_show_oneline(opt->graph);
361 }
362 if (opt->ref_message_ids && opt->ref_message_ids->nr > 0) {
363 int i, n;
364 n = opt->ref_message_ids->nr;
365 printf("In-Reply-To: <%s>\n", opt->ref_message_ids->items[n-1].string);
366 for (i = 0; i < n; i++)
367 printf("%s<%s>\n", (i > 0 ? "\t" : "References: "),
368 opt->ref_message_ids->items[i].string);
369 graph_show_oneline(opt->graph);
370 }
371 if (opt->mime_boundary) {
372 static char subject_buffer[1024];
373 static char buffer[1024];
374 struct strbuf filename = STRBUF_INIT;
375 *need_8bit_cte_p = -1; /* NEVER */
376 snprintf(subject_buffer, sizeof(subject_buffer) - 1,
377 "%s"
378 "MIME-Version: 1.0\n"
379 "Content-Type: multipart/mixed;"
380 " boundary=\"%s%s\"\n"
381 "\n"
382 "This is a multi-part message in MIME "
383 "format.\n"
384 "--%s%s\n"
385 "Content-Type: text/plain; "
386 "charset=UTF-8; format=fixed\n"
387 "Content-Transfer-Encoding: 8bit\n\n",
388 extra_headers ? extra_headers : "",
389 mime_boundary_leader, opt->mime_boundary,
390 mime_boundary_leader, opt->mime_boundary);
391 extra_headers = subject_buffer;
392
393 get_patch_filename(&filename,
394 opt->numbered_files ? NULL : commit, NULL,
395 opt);
396 snprintf(buffer, sizeof(buffer) - 1,
397 "\n--%s%s\n"
398 "Content-Type: text/x-patch;"
399 " name=\"%s\"\n"
400 "Content-Transfer-Encoding: 8bit\n"
401 "Content-Disposition: %s;"
402 " filename=\"%s\"\n\n",
403 mime_boundary_leader, opt->mime_boundary,
404 filename.buf,
405 opt->no_inline ? "attachment" : "inline",
406 filename.buf);
407 opt->diffopt.stat_sep = buffer;
408 strbuf_release(&filename);
409 }
410 *subject_p = subject;
411 *extra_headers_p = extra_headers;
412}
413
414static void show_sig_lines(struct rev_info *opt, int status, const char *bol)
415{
416 const char *color, *reset, *eol;
417
418 color = diff_get_color_opt(&opt->diffopt,
419 status ? DIFF_WHITESPACE : DIFF_FRAGINFO);
420 reset = diff_get_color_opt(&opt->diffopt, DIFF_RESET);
421 while (*bol) {
422 eol = strchrnul(bol, '\n');
423 printf("%s%.*s%s%s", color, (int)(eol - bol), bol, reset,
424 *eol ? "\n" : "");
425 bol = (*eol) ? (eol + 1) : eol;
426 }
427}
428
429static void show_signature(struct rev_info *opt, struct commit *commit)
430{
431 struct strbuf payload = STRBUF_INIT;
432 struct strbuf signature = STRBUF_INIT;
433 struct strbuf gpg_output = STRBUF_INIT;
434 int status;
435
436 if (parse_signed_commit(commit->object.sha1, &payload, &signature) <= 0)
437 goto out;
438
439 status = verify_signed_buffer(payload.buf, payload.len,
440 signature.buf, signature.len,
441 &gpg_output);
442 if (status && !gpg_output.len)
443 strbuf_addstr(&gpg_output, "No signature\n");
444
445 show_sig_lines(opt, status, gpg_output.buf);
446
447 out:
448 strbuf_release(&gpg_output);
449 strbuf_release(&payload);
450 strbuf_release(&signature);
451}
452
453static int which_parent(const unsigned char *sha1, const struct commit *commit)
454{
455 int nth;
456 const struct commit_list *parent;
457
458 for (nth = 0, parent = commit->parents; parent; parent = parent->next) {
459 if (!hashcmp(parent->item->object.sha1, sha1))
460 return nth;
461 nth++;
462 }
463 return -1;
464}
465
466static int is_common_merge(const struct commit *commit)
467{
468 return (commit->parents
469 && commit->parents->next
470 && !commit->parents->next->next);
471}
472
473static void show_one_mergetag(struct rev_info *opt,
474 struct commit_extra_header *extra,
475 struct commit *commit)
476{
477 unsigned char sha1[20];
478 struct tag *tag;
479 struct strbuf verify_message;
480 int status, nth;
481 size_t payload_size, gpg_message_offset;
482
483 hash_sha1_file(extra->value, extra->len, typename(OBJ_TAG), sha1);
484 tag = lookup_tag(sha1);
485 if (!tag)
486 return; /* error message already given */
487
488 strbuf_init(&verify_message, 256);
489 if (parse_tag_buffer(tag, extra->value, extra->len))
490 strbuf_addstr(&verify_message, "malformed mergetag\n");
491 else if (is_common_merge(commit) &&
492 !hashcmp(tag->tagged->sha1,
493 commit->parents->next->item->object.sha1))
494 strbuf_addf(&verify_message,
495 "merged tag '%s'\n", tag->tag);
496 else if ((nth = which_parent(tag->tagged->sha1, commit)) < 0)
497 strbuf_addf(&verify_message, "tag %s names a non-parent %s\n",
498 tag->tag, tag->tagged->sha1);
499 else
500 strbuf_addf(&verify_message,
501 "parent #%d, tagged '%s'\n", nth + 1, tag->tag);
502 gpg_message_offset = verify_message.len;
503
504 payload_size = parse_signature(extra->value, extra->len);
505 if ((extra->len <= payload_size) ||
506 (verify_signed_buffer(extra->value, payload_size,
507 extra->value + payload_size,
508 extra->len - payload_size,
509 &verify_message) &&
510 verify_message.len <= gpg_message_offset)) {
511 strbuf_addstr(&verify_message, "No signature\n");
512 status = -1;
513 }
514 else if (strstr(verify_message.buf + gpg_message_offset,
515 ": Good signature from "))
516 status = 0;
517 else
518 status = -1;
519
520 show_sig_lines(opt, status, verify_message.buf);
521 strbuf_release(&verify_message);
522}
523
524static void show_mergetag(struct rev_info *opt, struct commit *commit)
525{
526 struct commit_extra_header *extra, *to_free;
527
528 to_free = read_commit_extra_headers(commit, NULL);
529 for (extra = to_free; extra; extra = extra->next) {
530 if (strcmp(extra->key, "mergetag"))
531 continue; /* not a merge tag */
532 show_one_mergetag(opt, extra, commit);
533 }
534 free_commit_extra_headers(to_free);
535}
536
537void show_log(struct rev_info *opt)
538{
539 struct strbuf msgbuf = STRBUF_INIT;
540 struct log_info *log = opt->loginfo;
541 struct commit *commit = log->commit, *parent = log->parent;
542 int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
543 const char *extra_headers = opt->extra_headers;
544 struct pretty_print_context ctx = {0};
545
546 opt->loginfo = NULL;
547 ctx.show_notes = opt->show_notes;
548 if (!opt->verbose_header) {
549 graph_show_commit(opt->graph);
550
551 if (!opt->graph)
552 put_revision_mark(opt, commit);
553 fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit), stdout);
554 if (opt->print_parents)
555 show_parents(commit, abbrev_commit);
556 if (opt->children.name)
557 show_children(opt, commit, abbrev_commit);
558 show_decorations(opt, commit);
559 if (opt->graph && !graph_is_commit_finished(opt->graph)) {
560 putchar('\n');
561 graph_show_remainder(opt->graph);
562 }
563 putchar(opt->diffopt.line_termination);
564 return;
565 }
566
567 /*
568 * If use_terminator is set, we already handled any record termination
569 * at the end of the last record.
570 * Otherwise, add a diffopt.line_termination character before all
571 * entries but the first. (IOW, as a separator between entries)
572 */
573 if (opt->shown_one && !opt->use_terminator) {
574 /*
575 * If entries are separated by a newline, the output
576 * should look human-readable. If the last entry ended
577 * with a newline, print the graph output before this
578 * newline. Otherwise it will end up as a completely blank
579 * line and will look like a gap in the graph.
580 *
581 * If the entry separator is not a newline, the output is
582 * primarily intended for programmatic consumption, and we
583 * never want the extra graph output before the entry
584 * separator.
585 */
586 if (opt->diffopt.line_termination == '\n' &&
587 !opt->missing_newline)
588 graph_show_padding(opt->graph);
589 putchar(opt->diffopt.line_termination);
590 }
591 opt->shown_one = 1;
592
593 /*
594 * If the history graph was requested,
595 * print the graph, up to this commit's line
596 */
597 graph_show_commit(opt->graph);
598
599 /*
600 * Print header line of header..
601 */
602
603 if (opt->commit_format == CMIT_FMT_EMAIL) {
604 log_write_email_headers(opt, commit, &ctx.subject, &extra_headers,
605 &ctx.need_8bit_cte);
606 } else if (opt->commit_format != CMIT_FMT_USERFORMAT) {
607 fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), stdout);
608 if (opt->commit_format != CMIT_FMT_ONELINE)
609 fputs("commit ", stdout);
610
611 if (!opt->graph)
612 put_revision_mark(opt, commit);
613 fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit),
614 stdout);
615 if (opt->print_parents)
616 show_parents(commit, abbrev_commit);
617 if (opt->children.name)
618 show_children(opt, commit, abbrev_commit);
619 if (parent)
620 printf(" (from %s)",
621 find_unique_abbrev(parent->object.sha1,
622 abbrev_commit));
623 show_decorations(opt, commit);
624 printf("%s", diff_get_color_opt(&opt->diffopt, DIFF_RESET));
625 if (opt->commit_format == CMIT_FMT_ONELINE) {
626 putchar(' ');
627 } else {
628 putchar('\n');
629 graph_show_oneline(opt->graph);
630 }
631 if (opt->reflog_info) {
632 /*
633 * setup_revisions() ensures that opt->reflog_info
634 * and opt->graph cannot both be set,
635 * so we don't need to worry about printing the
636 * graph info here.
637 */
638 show_reflog_message(opt->reflog_info,
639 opt->commit_format == CMIT_FMT_ONELINE,
640 opt->date_mode,
641 opt->date_mode_explicit);
642 if (opt->commit_format == CMIT_FMT_ONELINE)
643 return;
644 }
645 }
646
647 if (opt->show_signature) {
648 show_signature(opt, commit);
649 show_mergetag(opt, commit);
650 }
651
652 if (!commit->buffer)
653 return;
654
655 /*
656 * And then the pretty-printed message itself
657 */
658 if (ctx.need_8bit_cte >= 0)
659 ctx.need_8bit_cte = has_non_ascii(opt->add_signoff);
660 ctx.date_mode = opt->date_mode;
661 ctx.date_mode_explicit = opt->date_mode_explicit;
662 ctx.abbrev = opt->diffopt.abbrev;
663 ctx.after_subject = extra_headers;
664 ctx.preserve_subject = opt->preserve_subject;
665 ctx.reflog_info = opt->reflog_info;
666 ctx.fmt = opt->commit_format;
667 pretty_print_commit(&ctx, commit, &msgbuf);
668
669 if (opt->add_signoff)
670 append_signoff(&msgbuf, opt->add_signoff);
671 if (opt->show_log_size) {
672 printf("log size %i\n", (int)msgbuf.len);
673 graph_show_oneline(opt->graph);
674 }
675
676 /*
677 * Set opt->missing_newline if msgbuf doesn't
678 * end in a newline (including if it is empty)
679 */
680 if (!msgbuf.len || msgbuf.buf[msgbuf.len - 1] != '\n')
681 opt->missing_newline = 1;
682 else
683 opt->missing_newline = 0;
684
685 if (opt->graph)
686 graph_show_commit_msg(opt->graph, &msgbuf);
687 else
688 fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
689 if (opt->use_terminator) {
690 if (!opt->missing_newline)
691 graph_show_padding(opt->graph);
692 putchar(opt->diffopt.line_termination);
693 }
694
695 strbuf_release(&msgbuf);
696}
697
698int log_tree_diff_flush(struct rev_info *opt)
699{
700 diffcore_std(&opt->diffopt);
701
702 if (diff_queue_is_empty()) {
703 int saved_fmt = opt->diffopt.output_format;
704 opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
705 diff_flush(&opt->diffopt);
706 opt->diffopt.output_format = saved_fmt;
707 return 0;
708 }
709
710 if (opt->loginfo && !opt->no_commit_id) {
711 /* When showing a verbose header (i.e. log message),
712 * and not in --pretty=oneline format, we would want
713 * an extra newline between the end of log and the
714 * output for readability.
715 */
716 show_log(opt);
717 if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) &&
718 opt->verbose_header &&
719 opt->commit_format != CMIT_FMT_ONELINE) {
720 int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
721 if (opt->diffopt.output_prefix) {
722 struct strbuf *msg = NULL;
723 msg = opt->diffopt.output_prefix(&opt->diffopt,
724 opt->diffopt.output_prefix_data);
725 fwrite(msg->buf, msg->len, 1, stdout);
726 }
727 if ((pch & opt->diffopt.output_format) == pch) {
728 printf("---");
729 }
730 putchar('\n');
731 }
732 }
733 diff_flush(&opt->diffopt);
734 return 1;
735}
736
737static int do_diff_combined(struct rev_info *opt, struct commit *commit)
738{
739 diff_tree_combined_merge(commit, opt->dense_combined_merges, opt);
740 return !opt->loginfo;
741}
742
743/*
744 * Show the diff of a commit.
745 *
746 * Return true if we printed any log info messages
747 */
748static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log_info *log)
749{
750 int showed_log;
751 struct commit_list *parents;
752 unsigned const char *sha1 = commit->object.sha1;
753
754 if (!opt->diff && !DIFF_OPT_TST(&opt->diffopt, EXIT_WITH_STATUS))
755 return 0;
756
757 /* Root commit? */
758 parents = commit->parents;
759 if (!parents) {
760 if (opt->show_root_diff) {
761 diff_root_tree_sha1(sha1, "", &opt->diffopt);
762 log_tree_diff_flush(opt);
763 }
764 return !opt->loginfo;
765 }
766
767 /* More than one parent? */
768 if (parents && parents->next) {
769 if (opt->ignore_merges)
770 return 0;
771 else if (opt->combine_merges)
772 return do_diff_combined(opt, commit);
773 else if (opt->first_parent_only) {
774 /*
775 * Generate merge log entry only for the first
776 * parent, showing summary diff of the others
777 * we merged _in_.
778 */
779 diff_tree_sha1(parents->item->object.sha1, sha1, "", &opt->diffopt);
780 log_tree_diff_flush(opt);
781 return !opt->loginfo;
782 }
783
784 /* If we show individual diffs, show the parent info */
785 log->parent = parents->item;
786 }
787
788 showed_log = 0;
789 for (;;) {
790 struct commit *parent = parents->item;
791
792 diff_tree_sha1(parent->object.sha1, sha1, "", &opt->diffopt);
793 log_tree_diff_flush(opt);
794
795 showed_log |= !opt->loginfo;
796
797 /* Set up the log info for the next parent, if any.. */
798 parents = parents->next;
799 if (!parents)
800 break;
801 log->parent = parents->item;
802 opt->loginfo = log;
803 }
804 return showed_log;
805}
806
807int log_tree_commit(struct rev_info *opt, struct commit *commit)
808{
809 struct log_info log;
810 int shown;
811
812 log.commit = commit;
813 log.parent = NULL;
814 opt->loginfo = &log;
815
816 shown = log_tree_diff(opt, commit, &log);
817 if (!shown && opt->loginfo && opt->always_show_header) {
818 log.parent = NULL;
819 show_log(opt);
820 shown = 1;
821 }
822 opt->loginfo = NULL;
823 maybe_flush_or_die(stdout, "stdout");
824 return shown;
825}