git.oblomov.eu Git - git/blob - log-tree.c

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