Merge branch 'maint'
[git] / log-tree.c
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
13 struct decoration name_decoration = { "object names" };
14
15 enum 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
25 static 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
35 static 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
42 static 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
67 int 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
85 static 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
94 static 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
140 static 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
149 void 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
160 static 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
169 static 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
177 void 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  */
213 static 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
256 static 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
292 static 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
302 void get_patch_filename(struct commit *commit, const char *subject, int nr,
303                         const char *suffix, struct strbuf *buf)
304 {
305         int suffix_len = strlen(suffix) + 1;
306         int start_len = buf->len;
307
308         strbuf_addf(buf, commit || subject ? "%04d-" : "%d", nr);
309         if (commit || subject) {
310                 int max_len = start_len + FORMAT_PATCH_NAME_MAX - suffix_len;
311                 struct pretty_print_context ctx = {0};
312
313                 if (subject)
314                         strbuf_addstr(buf, subject);
315                 else if (commit)
316                         format_commit_message(commit, "%f", buf, &ctx);
317
318                 if (max_len < buf->len)
319                         strbuf_setlen(buf, max_len);
320                 strbuf_addstr(buf, suffix);
321         }
322 }
323
324 void log_write_email_headers(struct rev_info *opt, struct commit *commit,
325                              const char **subject_p,
326                              const char **extra_headers_p,
327                              int *need_8bit_cte_p)
328 {
329         const char *subject = NULL;
330         const char *extra_headers = opt->extra_headers;
331         const char *name = sha1_to_hex(commit->object.sha1);
332
333         *need_8bit_cte_p = 0; /* unknown */
334         if (opt->total > 0) {
335                 static char buffer[64];
336                 snprintf(buffer, sizeof(buffer),
337                          "Subject: [%s%s%0*d/%d] ",
338                          opt->subject_prefix,
339                          *opt->subject_prefix ? " " : "",
340                          digits_in_number(opt->total),
341                          opt->nr, opt->total);
342                 subject = buffer;
343         } else if (opt->total == 0 && opt->subject_prefix && *opt->subject_prefix) {
344                 static char buffer[256];
345                 snprintf(buffer, sizeof(buffer),
346                          "Subject: [%s] ",
347                          opt->subject_prefix);
348                 subject = buffer;
349         } else {
350                 subject = "Subject: ";
351         }
352
353         printf("From %s Mon Sep 17 00:00:00 2001\n", name);
354         graph_show_oneline(opt->graph);
355         if (opt->message_id) {
356                 printf("Message-Id: <%s>\n", opt->message_id);
357                 graph_show_oneline(opt->graph);
358         }
359         if (opt->ref_message_ids && opt->ref_message_ids->nr > 0) {
360                 int i, n;
361                 n = opt->ref_message_ids->nr;
362                 printf("In-Reply-To: <%s>\n", opt->ref_message_ids->items[n-1].string);
363                 for (i = 0; i < n; i++)
364                         printf("%s<%s>\n", (i > 0 ? "\t" : "References: "),
365                                opt->ref_message_ids->items[i].string);
366                 graph_show_oneline(opt->graph);
367         }
368         if (opt->mime_boundary) {
369                 static char subject_buffer[1024];
370                 static char buffer[1024];
371                 struct strbuf filename =  STRBUF_INIT;
372                 *need_8bit_cte_p = -1; /* NEVER */
373                 snprintf(subject_buffer, sizeof(subject_buffer) - 1,
374                          "%s"
375                          "MIME-Version: 1.0\n"
376                          "Content-Type: multipart/mixed;"
377                          " boundary=\"%s%s\"\n"
378                          "\n"
379                          "This is a multi-part message in MIME "
380                          "format.\n"
381                          "--%s%s\n"
382                          "Content-Type: text/plain; "
383                          "charset=UTF-8; format=fixed\n"
384                          "Content-Transfer-Encoding: 8bit\n\n",
385                          extra_headers ? extra_headers : "",
386                          mime_boundary_leader, opt->mime_boundary,
387                          mime_boundary_leader, opt->mime_boundary);
388                 extra_headers = subject_buffer;
389
390                 get_patch_filename(opt->numbered_files ? NULL : commit, NULL,
391                                    opt->nr, opt->patch_suffix, &filename);
392                 snprintf(buffer, sizeof(buffer) - 1,
393                          "\n--%s%s\n"
394                          "Content-Type: text/x-patch;"
395                          " name=\"%s\"\n"
396                          "Content-Transfer-Encoding: 8bit\n"
397                          "Content-Disposition: %s;"
398                          " filename=\"%s\"\n\n",
399                          mime_boundary_leader, opt->mime_boundary,
400                          filename.buf,
401                          opt->no_inline ? "attachment" : "inline",
402                          filename.buf);
403                 opt->diffopt.stat_sep = buffer;
404                 strbuf_release(&filename);
405         }
406         *subject_p = subject;
407         *extra_headers_p = extra_headers;
408 }
409
410 static void show_sig_lines(struct rev_info *opt, int status, const char *bol)
411 {
412         const char *color, *reset, *eol;
413
414         color = diff_get_color_opt(&opt->diffopt,
415                                    status ? DIFF_WHITESPACE : DIFF_FRAGINFO);
416         reset = diff_get_color_opt(&opt->diffopt, DIFF_RESET);
417         while (*bol) {
418                 eol = strchrnul(bol, '\n');
419                 printf("%s%.*s%s%s", color, (int)(eol - bol), bol, reset,
420                        *eol ? "\n" : "");
421                 bol = (*eol) ? (eol + 1) : eol;
422         }
423 }
424
425 static void show_signature(struct rev_info *opt, struct commit *commit)
426 {
427         struct strbuf payload = STRBUF_INIT;
428         struct strbuf signature = STRBUF_INIT;
429         struct strbuf gpg_output = STRBUF_INIT;
430         int status;
431
432         if (parse_signed_commit(commit->object.sha1, &payload, &signature) <= 0)
433                 goto out;
434
435         status = verify_signed_buffer(payload.buf, payload.len,
436                                       signature.buf, signature.len,
437                                       &gpg_output);
438         if (status && !gpg_output.len)
439                 strbuf_addstr(&gpg_output, "No signature\n");
440
441         show_sig_lines(opt, status, gpg_output.buf);
442
443  out:
444         strbuf_release(&gpg_output);
445         strbuf_release(&payload);
446         strbuf_release(&signature);
447 }
448
449 static int which_parent(const unsigned char *sha1, const struct commit *commit)
450 {
451         int nth;
452         const struct commit_list *parent;
453
454         for (nth = 0, parent = commit->parents; parent; parent = parent->next) {
455                 if (!hashcmp(parent->item->object.sha1, sha1))
456                         return nth;
457                 nth++;
458         }
459         return -1;
460 }
461
462 static int is_common_merge(const struct commit *commit)
463 {
464         return (commit->parents
465                 && commit->parents->next
466                 && !commit->parents->next->next);
467 }
468
469 static void show_one_mergetag(struct rev_info *opt,
470                               struct commit_extra_header *extra,
471                               struct commit *commit)
472 {
473         unsigned char sha1[20];
474         struct tag *tag;
475         struct strbuf verify_message;
476         int status, nth;
477         size_t payload_size, gpg_message_offset;
478
479         hash_sha1_file(extra->value, extra->len, typename(OBJ_TAG), sha1);
480         tag = lookup_tag(sha1);
481         if (!tag)
482                 return; /* error message already given */
483
484         strbuf_init(&verify_message, 256);
485         if (parse_tag_buffer(tag, extra->value, extra->len))
486                 strbuf_addstr(&verify_message, "malformed mergetag\n");
487         else if (is_common_merge(commit) &&
488                  !hashcmp(tag->tagged->sha1,
489                           commit->parents->next->item->object.sha1))
490                 strbuf_addf(&verify_message,
491                             "merged tag '%s'\n", tag->tag);
492         else if ((nth = which_parent(tag->tagged->sha1, commit)) < 0)
493                 strbuf_addf(&verify_message, "tag %s names a non-parent %s\n",
494                                     tag->tag, tag->tagged->sha1);
495         else
496                 strbuf_addf(&verify_message,
497                             "parent #%d, tagged '%s'\n", nth + 1, tag->tag);
498         gpg_message_offset = verify_message.len;
499
500         payload_size = parse_signature(extra->value, extra->len);
501         if ((extra->len <= payload_size) ||
502             (verify_signed_buffer(extra->value, payload_size,
503                                   extra->value + payload_size,
504                                   extra->len - payload_size,
505                                   &verify_message) &&
506              verify_message.len <= gpg_message_offset)) {
507                 strbuf_addstr(&verify_message, "No signature\n");
508                 status = -1;
509         }
510         else if (strstr(verify_message.buf + gpg_message_offset,
511                         ": Good signature from "))
512                 status = 0;
513         else
514                 status = -1;
515
516         show_sig_lines(opt, status, verify_message.buf);
517         strbuf_release(&verify_message);
518 }
519
520 static void show_mergetag(struct rev_info *opt, struct commit *commit)
521 {
522         struct commit_extra_header *extra, *to_free;
523
524         to_free = read_commit_extra_headers(commit, NULL);
525         for (extra = to_free; extra; extra = extra->next) {
526                 if (strcmp(extra->key, "mergetag"))
527                         continue; /* not a merge tag */
528                 show_one_mergetag(opt, extra, commit);
529         }
530         free_commit_extra_headers(to_free);
531 }
532
533 void show_log(struct rev_info *opt)
534 {
535         struct strbuf msgbuf = STRBUF_INIT;
536         struct log_info *log = opt->loginfo;
537         struct commit *commit = log->commit, *parent = log->parent;
538         int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
539         const char *extra_headers = opt->extra_headers;
540         struct pretty_print_context ctx = {0};
541
542         opt->loginfo = NULL;
543         if (!opt->verbose_header) {
544                 graph_show_commit(opt->graph);
545
546                 if (!opt->graph)
547                         put_revision_mark(opt, commit);
548                 fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit), stdout);
549                 if (opt->print_parents)
550                         show_parents(commit, abbrev_commit);
551                 if (opt->children.name)
552                         show_children(opt, commit, abbrev_commit);
553                 show_decorations(opt, commit);
554                 if (opt->graph && !graph_is_commit_finished(opt->graph)) {
555                         putchar('\n');
556                         graph_show_remainder(opt->graph);
557                 }
558                 putchar(opt->diffopt.line_termination);
559                 return;
560         }
561
562         /*
563          * If use_terminator is set, we already handled any record termination
564          * at the end of the last record.
565          * Otherwise, add a diffopt.line_termination character before all
566          * entries but the first.  (IOW, as a separator between entries)
567          */
568         if (opt->shown_one && !opt->use_terminator) {
569                 /*
570                  * If entries are separated by a newline, the output
571                  * should look human-readable.  If the last entry ended
572                  * with a newline, print the graph output before this
573                  * newline.  Otherwise it will end up as a completely blank
574                  * line and will look like a gap in the graph.
575                  *
576                  * If the entry separator is not a newline, the output is
577                  * primarily intended for programmatic consumption, and we
578                  * never want the extra graph output before the entry
579                  * separator.
580                  */
581                 if (opt->diffopt.line_termination == '\n' &&
582                     !opt->missing_newline)
583                         graph_show_padding(opt->graph);
584                 putchar(opt->diffopt.line_termination);
585         }
586         opt->shown_one = 1;
587
588         /*
589          * If the history graph was requested,
590          * print the graph, up to this commit's line
591          */
592         graph_show_commit(opt->graph);
593
594         /*
595          * Print header line of header..
596          */
597
598         if (opt->commit_format == CMIT_FMT_EMAIL) {
599                 log_write_email_headers(opt, commit, &ctx.subject, &extra_headers,
600                                         &ctx.need_8bit_cte);
601         } else if (opt->commit_format != CMIT_FMT_USERFORMAT) {
602                 fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), stdout);
603                 if (opt->commit_format != CMIT_FMT_ONELINE)
604                         fputs("commit ", stdout);
605
606                 if (!opt->graph)
607                         put_revision_mark(opt, commit);
608                 fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit),
609                       stdout);
610                 if (opt->print_parents)
611                         show_parents(commit, abbrev_commit);
612                 if (opt->children.name)
613                         show_children(opt, commit, abbrev_commit);
614                 if (parent)
615                         printf(" (from %s)",
616                                find_unique_abbrev(parent->object.sha1,
617                                                   abbrev_commit));
618                 show_decorations(opt, commit);
619                 printf("%s", diff_get_color_opt(&opt->diffopt, DIFF_RESET));
620                 if (opt->commit_format == CMIT_FMT_ONELINE) {
621                         putchar(' ');
622                 } else {
623                         putchar('\n');
624                         graph_show_oneline(opt->graph);
625                 }
626                 if (opt->reflog_info) {
627                         /*
628                          * setup_revisions() ensures that opt->reflog_info
629                          * and opt->graph cannot both be set,
630                          * so we don't need to worry about printing the
631                          * graph info here.
632                          */
633                         show_reflog_message(opt->reflog_info,
634                                             opt->commit_format == CMIT_FMT_ONELINE,
635                                             opt->date_mode,
636                                             opt->date_mode_explicit);
637                         if (opt->commit_format == CMIT_FMT_ONELINE)
638                                 return;
639                 }
640         }
641
642         if (opt->show_signature) {
643                 show_signature(opt, commit);
644                 show_mergetag(opt, commit);
645         }
646
647         if (!commit->buffer)
648                 return;
649
650         if (opt->show_notes) {
651                 int raw;
652                 struct strbuf notebuf = STRBUF_INIT;
653
654                 raw = (opt->commit_format == CMIT_FMT_USERFORMAT);
655                 format_display_notes(commit->object.sha1, &notebuf,
656                                      get_log_output_encoding(), raw);
657                 ctx.notes_message = notebuf.len
658                         ? strbuf_detach(&notebuf, NULL)
659                         : xcalloc(1, 1);
660         }
661
662         /*
663          * And then the pretty-printed message itself
664          */
665         if (ctx.need_8bit_cte >= 0)
666                 ctx.need_8bit_cte = has_non_ascii(opt->add_signoff);
667         ctx.date_mode = opt->date_mode;
668         ctx.date_mode_explicit = opt->date_mode_explicit;
669         ctx.abbrev = opt->diffopt.abbrev;
670         ctx.after_subject = extra_headers;
671         ctx.preserve_subject = opt->preserve_subject;
672         ctx.reflog_info = opt->reflog_info;
673         ctx.fmt = opt->commit_format;
674         ctx.color = opt->diffopt.use_color;
675         pretty_print_commit(&ctx, commit, &msgbuf);
676
677         if (opt->add_signoff)
678                 append_signoff(&msgbuf, opt->add_signoff);
679
680         if ((ctx.fmt != CMIT_FMT_USERFORMAT) &&
681             ctx.notes_message && *ctx.notes_message) {
682                 if (ctx.fmt == CMIT_FMT_EMAIL) {
683                         strbuf_addstr(&msgbuf, "---\n");
684                         opt->shown_dashes = 1;
685                 }
686                 strbuf_addstr(&msgbuf, ctx.notes_message);
687         }
688
689         if (opt->show_log_size) {
690                 printf("log size %i\n", (int)msgbuf.len);
691                 graph_show_oneline(opt->graph);
692         }
693
694         /*
695          * Set opt->missing_newline if msgbuf doesn't
696          * end in a newline (including if it is empty)
697          */
698         if (!msgbuf.len || msgbuf.buf[msgbuf.len - 1] != '\n')
699                 opt->missing_newline = 1;
700         else
701                 opt->missing_newline = 0;
702
703         if (opt->graph)
704                 graph_show_commit_msg(opt->graph, &msgbuf);
705         else
706                 fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
707         if (opt->use_terminator) {
708                 if (!opt->missing_newline)
709                         graph_show_padding(opt->graph);
710                 putchar(opt->diffopt.line_termination);
711         }
712
713         strbuf_release(&msgbuf);
714         free(ctx.notes_message);
715 }
716
717 int log_tree_diff_flush(struct rev_info *opt)
718 {
719         opt->shown_dashes = 0;
720         diffcore_std(&opt->diffopt);
721
722         if (diff_queue_is_empty()) {
723                 int saved_fmt = opt->diffopt.output_format;
724                 opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
725                 diff_flush(&opt->diffopt);
726                 opt->diffopt.output_format = saved_fmt;
727                 return 0;
728         }
729
730         if (opt->loginfo && !opt->no_commit_id) {
731                 show_log(opt);
732                 if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) &&
733                     opt->verbose_header &&
734                     opt->commit_format != CMIT_FMT_ONELINE) {
735                         /*
736                          * When showing a verbose header (i.e. log message),
737                          * and not in --pretty=oneline format, we would want
738                          * an extra newline between the end of log and the
739                          * diff/diffstat output for readability.
740                          */
741                         int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
742                         if (opt->diffopt.output_prefix) {
743                                 struct strbuf *msg = NULL;
744                                 msg = opt->diffopt.output_prefix(&opt->diffopt,
745                                         opt->diffopt.output_prefix_data);
746                                 fwrite(msg->buf, msg->len, 1, stdout);
747                         }
748
749                         /*
750                          * We may have shown three-dashes line early
751                          * between notes and the log message, in which
752                          * case we only want a blank line after the
753                          * notes without (an extra) three-dashes line.
754                          * Otherwise, we show the three-dashes line if
755                          * we are showing the patch with diffstat, but
756                          * in that case, there is no extra blank line
757                          * after the three-dashes line.
758                          */
759                         if (!opt->shown_dashes &&
760                             (pch & opt->diffopt.output_format) == pch)
761                                 printf("---");
762                         putchar('\n');
763                 }
764         }
765         diff_flush(&opt->diffopt);
766         return 1;
767 }
768
769 static int do_diff_combined(struct rev_info *opt, struct commit *commit)
770 {
771         diff_tree_combined_merge(commit, opt->dense_combined_merges, opt);
772         return !opt->loginfo;
773 }
774
775 /*
776  * Show the diff of a commit.
777  *
778  * Return true if we printed any log info messages
779  */
780 static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log_info *log)
781 {
782         int showed_log;
783         struct commit_list *parents;
784         unsigned const char *sha1 = commit->object.sha1;
785
786         if (!opt->diff && !DIFF_OPT_TST(&opt->diffopt, EXIT_WITH_STATUS))
787                 return 0;
788
789         /* Root commit? */
790         parents = commit->parents;
791         if (!parents) {
792                 if (opt->show_root_diff) {
793                         diff_root_tree_sha1(sha1, "", &opt->diffopt);
794                         log_tree_diff_flush(opt);
795                 }
796                 return !opt->loginfo;
797         }
798
799         /* More than one parent? */
800         if (parents && parents->next) {
801                 if (opt->ignore_merges)
802                         return 0;
803                 else if (opt->combine_merges)
804                         return do_diff_combined(opt, commit);
805                 else if (opt->first_parent_only) {
806                         /*
807                          * Generate merge log entry only for the first
808                          * parent, showing summary diff of the others
809                          * we merged _in_.
810                          */
811                         diff_tree_sha1(parents->item->object.sha1, sha1, "", &opt->diffopt);
812                         log_tree_diff_flush(opt);
813                         return !opt->loginfo;
814                 }
815
816                 /* If we show individual diffs, show the parent info */
817                 log->parent = parents->item;
818         }
819
820         showed_log = 0;
821         for (;;) {
822                 struct commit *parent = parents->item;
823
824                 diff_tree_sha1(parent->object.sha1, sha1, "", &opt->diffopt);
825                 log_tree_diff_flush(opt);
826
827                 showed_log |= !opt->loginfo;
828
829                 /* Set up the log info for the next parent, if any.. */
830                 parents = parents->next;
831                 if (!parents)
832                         break;
833                 log->parent = parents->item;
834                 opt->loginfo = log;
835         }
836         return showed_log;
837 }
838
839 int log_tree_commit(struct rev_info *opt, struct commit *commit)
840 {
841         struct log_info log;
842         int shown;
843
844         log.commit = commit;
845         log.parent = NULL;
846         opt->loginfo = &log;
847
848         shown = log_tree_diff(opt, commit, &log);
849         if (!shown && opt->loginfo && opt->always_show_header) {
850                 log.parent = NULL;
851                 show_log(opt);
852                 shown = 1;
853         }
854         opt->loginfo = NULL;
855         maybe_flush_or_die(stdout, "stdout");
856         return shown;
857 }