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