Code

gitweb: Fix unintended "--no-merges" for regular Atom feed
[git.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"
13 struct decoration name_decoration = { "object names" };
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 };
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 };
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 }
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 }
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 }
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)
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 }
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;
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         }
113         obj = parse_object(sha1);
114         if (!obj)
115                 return 0;
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;
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;
140 static int add_graft_decoration(const struct commit_graft *graft, void *cb_data)
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;
149 void load_ref_decorations(int flags)
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         }
160 static void show_parents(struct commit *commit, int abbrev)
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         }
169 static void show_children(struct rev_info *opt, struct commit *commit, int abbrev)
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         }
177 void show_decorations(struct rev_info *opt, struct commit *commit)
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);
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(')');
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)
215         char *cp;
216         int seen_colon = 0;
217         int seen_at = 0;
218         int seen_name = 0;
219         int seen_head = 0;
221         cp = letter + size;
222         while (letter <= --cp && *cp == '\n')
223                 continue;
225         while (letter <= cp) {
226                 char ch = *cp--;
227                 if (ch == '\n')
228                         break;
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;
256 static void append_signoff(struct strbuf *sb, const char *signoff)
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;
263         cp = sb->buf;
265         /* First see if we already have the sign-off by the signer */
266         while ((cp = strstr(cp, signed_off_by))) {
268                 has_signoff = 1;
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         }
281         if (!has_signoff)
282                 has_signoff = detect_any_signoff(sb->buf, sb->len);
284         if (!has_signoff)
285                 strbuf_addch(sb, '\n');
287         strbuf_addstr(sb, signed_off_by);
288         strbuf_add(sb, signoff, signoff_len);
289         strbuf_addch(sb, '\n');
292 static unsigned int digits_in_number(unsigned int number)
294         unsigned int i = 10, result = 1;
295         while (i <= number) {
296                 i *= 10;
297                 result++;
298         }
299         return result;
302 void get_patch_filename(struct commit *commit, int nr, const char *suffix,
303                         struct strbuf *buf)
305         int suffix_len = strlen(suffix) + 1;
306         int start_len = buf->len;
308         strbuf_addf(buf, commit ? "%04d-" : "%d", nr);
309         if (commit) {
310                 int max_len = start_len + FORMAT_PATCH_NAME_MAX - suffix_len;
311                 struct pretty_print_context ctx = {0};
312                 ctx.date_mode = DATE_NORMAL;
314                 format_commit_message(commit, "%f", buf, &ctx);
315                 if (max_len < buf->len)
316                         strbuf_setlen(buf, max_len);
317                 strbuf_addstr(buf, suffix);
318         }
321 void log_write_email_headers(struct rev_info *opt, struct commit *commit,
322                              const char **subject_p,
323                              const char **extra_headers_p,
324                              int *need_8bit_cte_p)
326         const char *subject = NULL;
327         const char *extra_headers = opt->extra_headers;
328         const char *name = sha1_to_hex(commit->object.sha1);
330         *need_8bit_cte_p = 0; /* unknown */
331         if (opt->total > 0) {
332                 static char buffer[64];
333                 snprintf(buffer, sizeof(buffer),
334                          "Subject: [%s%s%0*d/%d] ",
335                          opt->subject_prefix,
336                          *opt->subject_prefix ? " " : "",
337                          digits_in_number(opt->total),
338                          opt->nr, opt->total);
339                 subject = buffer;
340         } else if (opt->total == 0 && opt->subject_prefix && *opt->subject_prefix) {
341                 static char buffer[256];
342                 snprintf(buffer, sizeof(buffer),
343                          "Subject: [%s] ",
344                          opt->subject_prefix);
345                 subject = buffer;
346         } else {
347                 subject = "Subject: ";
348         }
350         printf("From %s Mon Sep 17 00:00:00 2001\n", name);
351         graph_show_oneline(opt->graph);
352         if (opt->message_id) {
353                 printf("Message-Id: <%s>\n", opt->message_id);
354                 graph_show_oneline(opt->graph);
355         }
356         if (opt->ref_message_ids && opt->ref_message_ids->nr > 0) {
357                 int i, n;
358                 n = opt->ref_message_ids->nr;
359                 printf("In-Reply-To: <%s>\n", opt->ref_message_ids->items[n-1].string);
360                 for (i = 0; i < n; i++)
361                         printf("%s<%s>\n", (i > 0 ? "\t" : "References: "),
362                                opt->ref_message_ids->items[i].string);
363                 graph_show_oneline(opt->graph);
364         }
365         if (opt->mime_boundary) {
366                 static char subject_buffer[1024];
367                 static char buffer[1024];
368                 struct strbuf filename =  STRBUF_INIT;
369                 *need_8bit_cte_p = -1; /* NEVER */
370                 snprintf(subject_buffer, sizeof(subject_buffer) - 1,
371                          "%s"
372                          "MIME-Version: 1.0\n"
373                          "Content-Type: multipart/mixed;"
374                          " boundary=\"%s%s\"\n"
375                          "\n"
376                          "This is a multi-part message in MIME "
377                          "format.\n"
378                          "--%s%s\n"
379                          "Content-Type: text/plain; "
380                          "charset=UTF-8; format=fixed\n"
381                          "Content-Transfer-Encoding: 8bit\n\n",
382                          extra_headers ? extra_headers : "",
383                          mime_boundary_leader, opt->mime_boundary,
384                          mime_boundary_leader, opt->mime_boundary);
385                 extra_headers = subject_buffer;
387                 get_patch_filename(opt->numbered_files ? NULL : commit, opt->nr,
388                                     opt->patch_suffix, &filename);
389                 snprintf(buffer, sizeof(buffer) - 1,
390                          "\n--%s%s\n"
391                          "Content-Type: text/x-patch;"
392                          " name=\"%s\"\n"
393                          "Content-Transfer-Encoding: 8bit\n"
394                          "Content-Disposition: %s;"
395                          " filename=\"%s\"\n\n",
396                          mime_boundary_leader, opt->mime_boundary,
397                          filename.buf,
398                          opt->no_inline ? "attachment" : "inline",
399                          filename.buf);
400                 opt->diffopt.stat_sep = buffer;
401                 strbuf_release(&filename);
402         }
403         *subject_p = subject;
404         *extra_headers_p = extra_headers;
407 static void show_sig_lines(struct rev_info *opt, int status, const char *bol)
409         const char *color, *reset, *eol;
411         color = diff_get_color_opt(&opt->diffopt,
412                                    status ? DIFF_WHITESPACE : DIFF_FRAGINFO);
413         reset = diff_get_color_opt(&opt->diffopt, DIFF_RESET);
414         while (*bol) {
415                 eol = strchrnul(bol, '\n');
416                 printf("%s%.*s%s%s", color, (int)(eol - bol), bol, reset,
417                        *eol ? "\n" : "");
418                 bol = (*eol) ? (eol + 1) : eol;
419         }
422 static void show_signature(struct rev_info *opt, struct commit *commit)
424         struct strbuf payload = STRBUF_INIT;
425         struct strbuf signature = STRBUF_INIT;
426         struct strbuf gpg_output = STRBUF_INIT;
427         int status;
429         if (parse_signed_commit(commit->object.sha1, &payload, &signature) <= 0)
430                 goto out;
432         status = verify_signed_buffer(payload.buf, payload.len,
433                                       signature.buf, signature.len,
434                                       &gpg_output);
435         if (status && !gpg_output.len)
436                 strbuf_addstr(&gpg_output, "No signature\n");
438         show_sig_lines(opt, status, gpg_output.buf);
440  out:
441         strbuf_release(&gpg_output);
442         strbuf_release(&payload);
443         strbuf_release(&signature);
446 static int which_parent(const unsigned char *sha1, const struct commit *commit)
448         int nth;
449         const struct commit_list *parent;
451         for (nth = 0, parent = commit->parents; parent; parent = parent->next) {
452                 if (!hashcmp(parent->item->object.sha1, sha1))
453                         return nth;
454                 nth++;
455         }
456         return -1;
459 static int is_common_merge(const struct commit *commit)
461         return (commit->parents
462                 && commit->parents->next
463                 && !commit->parents->next->next);
466 static void show_one_mergetag(struct rev_info *opt,
467                               struct commit_extra_header *extra,
468                               struct commit *commit)
470         unsigned char sha1[20];
471         struct tag *tag;
472         struct strbuf verify_message;
473         int status, nth;
474         size_t payload_size, gpg_message_offset;
476         hash_sha1_file(extra->value, extra->len, typename(OBJ_TAG), sha1);
477         tag = lookup_tag(sha1);
478         if (!tag)
479                 return; /* error message already given */
481         strbuf_init(&verify_message, 256);
482         if (parse_tag_buffer(tag, extra->value, extra->len))
483                 strbuf_addstr(&verify_message, "malformed mergetag\n");
484         else if (is_common_merge(commit) &&
485                  !hashcmp(tag->tagged->sha1,
486                           commit->parents->next->item->object.sha1))
487                 strbuf_addf(&verify_message,
488                             "merged tag '%s'\n", tag->tag);
489         else if ((nth = which_parent(tag->tagged->sha1, commit)) < 0)
490                 strbuf_addf(&verify_message, "tag %s names a non-parent %s\n",
491                                     tag->tag, tag->tagged->sha1);
492         else
493                 strbuf_addf(&verify_message,
494                             "parent #%d, tagged '%s'\n", nth + 1, tag->tag);
495         gpg_message_offset = verify_message.len;
497         payload_size = parse_signature(extra->value, extra->len);
498         if ((extra->len <= payload_size) ||
499             (verify_signed_buffer(extra->value, payload_size,
500                                   extra->value + payload_size,
501                                   extra->len - payload_size,
502                                   &verify_message) &&
503              verify_message.len <= gpg_message_offset)) {
504                 strbuf_addstr(&verify_message, "No signature\n");
505                 status = -1;
506         }
507         else if (strstr(verify_message.buf + gpg_message_offset,
508                         ": Good signature from "))
509                 status = 0;
510         else
511                 status = -1;
513         show_sig_lines(opt, status, verify_message.buf);
514         strbuf_release(&verify_message);
517 static void show_mergetag(struct rev_info *opt, struct commit *commit)
519         struct commit_extra_header *extra, *to_free;
521         to_free = read_commit_extra_headers(commit, NULL);
522         for (extra = to_free; extra; extra = extra->next) {
523                 if (strcmp(extra->key, "mergetag"))
524                         continue; /* not a merge tag */
525                 show_one_mergetag(opt, extra, commit);
526         }
527         free_commit_extra_headers(to_free);
530 void show_log(struct rev_info *opt)
532         struct strbuf msgbuf = STRBUF_INIT;
533         struct log_info *log = opt->loginfo;
534         struct commit *commit = log->commit, *parent = log->parent;
535         int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
536         const char *extra_headers = opt->extra_headers;
537         struct pretty_print_context ctx = {0};
539         opt->loginfo = NULL;
540         ctx.show_notes = opt->show_notes;
541         if (!opt->verbose_header) {
542                 graph_show_commit(opt->graph);
544                 if (!opt->graph)
545                         put_revision_mark(opt, commit);
546                 fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit), stdout);
547                 if (opt->print_parents)
548                         show_parents(commit, abbrev_commit);
549                 if (opt->children.name)
550                         show_children(opt, commit, abbrev_commit);
551                 show_decorations(opt, commit);
552                 if (opt->graph && !graph_is_commit_finished(opt->graph)) {
553                         putchar('\n');
554                         graph_show_remainder(opt->graph);
555                 }
556                 putchar(opt->diffopt.line_termination);
557                 return;
558         }
560         /*
561          * If use_terminator is set, we already handled any record termination
562          * at the end of the last record.
563          * Otherwise, add a diffopt.line_termination character before all
564          * entries but the first.  (IOW, as a separator between entries)
565          */
566         if (opt->shown_one && !opt->use_terminator) {
567                 /*
568                  * If entries are separated by a newline, the output
569                  * should look human-readable.  If the last entry ended
570                  * with a newline, print the graph output before this
571                  * newline.  Otherwise it will end up as a completely blank
572                  * line and will look like a gap in the graph.
573                  *
574                  * If the entry separator is not a newline, the output is
575                  * primarily intended for programmatic consumption, and we
576                  * never want the extra graph output before the entry
577                  * separator.
578                  */
579                 if (opt->diffopt.line_termination == '\n' &&
580                     !opt->missing_newline)
581                         graph_show_padding(opt->graph);
582                 putchar(opt->diffopt.line_termination);
583         }
584         opt->shown_one = 1;
586         /*
587          * If the history graph was requested,
588          * print the graph, up to this commit's line
589          */
590         graph_show_commit(opt->graph);
592         /*
593          * Print header line of header..
594          */
596         if (opt->commit_format == CMIT_FMT_EMAIL) {
597                 log_write_email_headers(opt, commit, &ctx.subject, &extra_headers,
598                                         &ctx.need_8bit_cte);
599         } else if (opt->commit_format != CMIT_FMT_USERFORMAT) {
600                 fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), stdout);
601                 if (opt->commit_format != CMIT_FMT_ONELINE)
602                         fputs("commit ", stdout);
604                 if (!opt->graph)
605                         put_revision_mark(opt, commit);
606                 fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit),
607                       stdout);
608                 if (opt->print_parents)
609                         show_parents(commit, abbrev_commit);
610                 if (opt->children.name)
611                         show_children(opt, commit, abbrev_commit);
612                 if (parent)
613                         printf(" (from %s)",
614                                find_unique_abbrev(parent->object.sha1,
615                                                   abbrev_commit));
616                 show_decorations(opt, commit);
617                 printf("%s", diff_get_color_opt(&opt->diffopt, DIFF_RESET));
618                 if (opt->commit_format == CMIT_FMT_ONELINE) {
619                         putchar(' ');
620                 } else {
621                         putchar('\n');
622                         graph_show_oneline(opt->graph);
623                 }
624                 if (opt->reflog_info) {
625                         /*
626                          * setup_revisions() ensures that opt->reflog_info
627                          * and opt->graph cannot both be set,
628                          * so we don't need to worry about printing the
629                          * graph info here.
630                          */
631                         show_reflog_message(opt->reflog_info,
632                                     opt->commit_format == CMIT_FMT_ONELINE,
633                                     opt->date_mode_explicit ?
634                                         opt->date_mode :
635                                         DATE_NORMAL);
636                         if (opt->commit_format == CMIT_FMT_ONELINE)
637                                 return;
638                 }
639         }
641         if (opt->show_signature) {
642                 show_signature(opt, commit);
643                 show_mergetag(opt, commit);
644         }
646         if (!commit->buffer)
647                 return;
649         /*
650          * And then the pretty-printed message itself
651          */
652         if (ctx.need_8bit_cte >= 0)
653                 ctx.need_8bit_cte = has_non_ascii(opt->add_signoff);
654         ctx.date_mode = opt->date_mode;
655         ctx.abbrev = opt->diffopt.abbrev;
656         ctx.after_subject = extra_headers;
657         ctx.preserve_subject = opt->preserve_subject;
658         ctx.reflog_info = opt->reflog_info;
659         ctx.fmt = opt->commit_format;
660         pretty_print_commit(&ctx, commit, &msgbuf);
662         if (opt->add_signoff)
663                 append_signoff(&msgbuf, opt->add_signoff);
664         if (opt->show_log_size) {
665                 printf("log size %i\n", (int)msgbuf.len);
666                 graph_show_oneline(opt->graph);
667         }
669         /*
670          * Set opt->missing_newline if msgbuf doesn't
671          * end in a newline (including if it is empty)
672          */
673         if (!msgbuf.len || msgbuf.buf[msgbuf.len - 1] != '\n')
674                 opt->missing_newline = 1;
675         else
676                 opt->missing_newline = 0;
678         if (opt->graph)
679                 graph_show_commit_msg(opt->graph, &msgbuf);
680         else
681                 fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
682         if (opt->use_terminator) {
683                 if (!opt->missing_newline)
684                         graph_show_padding(opt->graph);
685                 putchar('\n');
686         }
688         strbuf_release(&msgbuf);
691 int log_tree_diff_flush(struct rev_info *opt)
693         diffcore_std(&opt->diffopt);
695         if (diff_queue_is_empty()) {
696                 int saved_fmt = opt->diffopt.output_format;
697                 opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
698                 diff_flush(&opt->diffopt);
699                 opt->diffopt.output_format = saved_fmt;
700                 return 0;
701         }
703         if (opt->loginfo && !opt->no_commit_id) {
704                 /* When showing a verbose header (i.e. log message),
705                  * and not in --pretty=oneline format, we would want
706                  * an extra newline between the end of log and the
707                  * output for readability.
708                  */
709                 show_log(opt);
710                 if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) &&
711                     opt->verbose_header &&
712                     opt->commit_format != CMIT_FMT_ONELINE) {
713                         int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
714                         if ((pch & opt->diffopt.output_format) == pch)
715                                 printf("---");
716                         if (opt->diffopt.output_prefix) {
717                                 struct strbuf *msg = NULL;
718                                 msg = opt->diffopt.output_prefix(&opt->diffopt,
719                                         opt->diffopt.output_prefix_data);
720                                 fwrite(msg->buf, msg->len, 1, stdout);
721                         }
722                         putchar('\n');
723                 }
724         }
725         diff_flush(&opt->diffopt);
726         return 1;
729 static int do_diff_combined(struct rev_info *opt, struct commit *commit)
731         diff_tree_combined_merge(commit, opt->dense_combined_merges, opt);
732         return !opt->loginfo;
735 /*
736  * Show the diff of a commit.
737  *
738  * Return true if we printed any log info messages
739  */
740 static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log_info *log)
742         int showed_log;
743         struct commit_list *parents;
744         unsigned const char *sha1 = commit->object.sha1;
746         if (!opt->diff && !DIFF_OPT_TST(&opt->diffopt, EXIT_WITH_STATUS))
747                 return 0;
749         /* Root commit? */
750         parents = commit->parents;
751         if (!parents) {
752                 if (opt->show_root_diff) {
753                         diff_root_tree_sha1(sha1, "", &opt->diffopt);
754                         log_tree_diff_flush(opt);
755                 }
756                 return !opt->loginfo;
757         }
759         /* More than one parent? */
760         if (parents && parents->next) {
761                 if (opt->ignore_merges)
762                         return 0;
763                 else if (opt->combine_merges)
764                         return do_diff_combined(opt, commit);
765                 else if (opt->first_parent_only) {
766                         /*
767                          * Generate merge log entry only for the first
768                          * parent, showing summary diff of the others
769                          * we merged _in_.
770                          */
771                         diff_tree_sha1(parents->item->object.sha1, sha1, "", &opt->diffopt);
772                         log_tree_diff_flush(opt);
773                         return !opt->loginfo;
774                 }
776                 /* If we show individual diffs, show the parent info */
777                 log->parent = parents->item;
778         }
780         showed_log = 0;
781         for (;;) {
782                 struct commit *parent = parents->item;
784                 diff_tree_sha1(parent->object.sha1, sha1, "", &opt->diffopt);
785                 log_tree_diff_flush(opt);
787                 showed_log |= !opt->loginfo;
789                 /* Set up the log info for the next parent, if any.. */
790                 parents = parents->next;
791                 if (!parents)
792                         break;
793                 log->parent = parents->item;
794                 opt->loginfo = log;
795         }
796         return showed_log;
799 int log_tree_commit(struct rev_info *opt, struct commit *commit)
801         struct log_info log;
802         int shown;
804         log.commit = commit;
805         log.parent = NULL;
806         opt->loginfo = &log;
808         shown = log_tree_diff(opt, commit, &log);
809         if (!shown && opt->loginfo && opt->always_show_header) {
810                 log.parent = NULL;
811                 show_log(opt);
812                 shown = 1;
813         }
814         opt->loginfo = NULL;
815         maybe_flush_or_die(stdout, "stdout");
816         return shown;