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