7 #include "reflog-walk.h"
9 #include "string-list.h"
11 #include "gpg-interface.h"
13 #define APPEND_SIGNOFF_DEDUP (1u <<0)
15 struct decoration name_decoration
= { "object names" };
17 enum decoration_type
{
20 DECORATION_REF_REMOTE
,
27 static char decoration_colors
[][COLOR_MAXLEN
] = {
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 */
37 static const char *decorate_get_color(int decorate_use_color
, enum decoration_type ix
)
39 if (want_color(decorate_use_color
))
40 return decoration_colors
[ix
];
44 static int parse_decorate_color_slot(const char *slot
)
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
54 * We love being consistent, don't we?
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
;
69 int parse_decorate_color_config(const char *var
, const int ofs
, const char *value
)
71 int slot
= parse_decorate_color_slot(var
+ ofs
);
75 return config_error_nonbool(var
);
76 color_parse(value
, var
, decoration_colors
[slot
]);
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
84 #define decorate_get_color_opt(o, ix) \
85 decorate_get_color((o)->use_color, ix)
87 static void add_name_decoration(enum decoration_type type
, const char *name
, struct object
*obj
)
89 int nlen
= strlen(name
);
90 struct name_decoration
*res
= xmalloc(sizeof(struct name_decoration
) + nlen
);
91 memcpy(res
->name
, name
, nlen
+ 1);
93 res
->next
= add_decoration(&name_decoration
, obj
, res
);
96 static int add_ref_decoration(const char *refname
, const unsigned char *sha1
, int flags
, void *cb_data
)
99 enum decoration_type type
= DECORATION_NONE
;
101 if (!prefixcmp(refname
, "refs/replace/")) {
102 unsigned char original_sha1
[20];
103 if (!read_replace_refs
)
105 if (get_sha1_hex(refname
+ 13, original_sha1
)) {
106 warning("invalid replace ref %s", refname
);
109 obj
= parse_object(original_sha1
);
111 add_name_decoration(DECORATION_GRAFTED
, "replaced", obj
);
115 obj
= parse_object(sha1
);
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
;
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
;
137 add_name_decoration(DECORATION_REF_TAG
, refname
, obj
);
142 static int add_graft_decoration(const struct commit_graft
*graft
, void *cb_data
)
144 struct commit
*commit
= lookup_commit(graft
->sha1
);
147 add_name_decoration(DECORATION_GRAFTED
, "grafted", &commit
->object
);
151 void load_ref_decorations(int flags
)
156 for_each_ref(add_ref_decoration
, &flags
);
157 head_ref(add_ref_decoration
, &flags
);
158 for_each_commit_graft(add_graft_decoration
, NULL
);
162 static void show_parents(struct commit
*commit
, int abbrev
)
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
));
171 static void show_children(struct rev_info
*opt
, struct commit
*commit
, int abbrev
)
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
));
179 void show_decorations(struct rev_info
*opt
, struct commit
*commit
)
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
);
188 if (opt
->show_source
&& commit
->util
)
189 printf("\t%s", (char *) commit
->util
);
190 if (!opt
->show_decorations
)
192 decoration
= lookup_decoration(&name_decoration
, &commit
->object
);
197 printf("%s", prefix
);
198 fputs(decorate_get_color_opt(&opt
->diffopt
, decoration
->type
),
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
);
206 decoration
= decoration
->next
;
212 * Search for "^[-A-Za-z]+: [^@]+@" pattern. It usually matches
213 * Signed-off-by: and Acked-by: lines.
215 static int detect_any_signoff(char *letter
, int size
)
224 while (letter
<= --cp
&& *cp
== '\n')
227 while (letter
<= cp
) {
246 if (('A' <= ch
&& ch
<= 'Z') ||
247 ('a' <= ch
&& ch
<= 'z') ||
252 /* no empty last line doesn't match */
255 return seen_head
&& seen_name
;
258 static void append_signoff(struct strbuf
*sb
, int ignore_footer
, unsigned flag
)
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
);
270 /* First see if we already have the sign-off by the signer */
271 while ((cp
= strstr(cp
, signed_off_by
))) {
275 cp
+= strlen(signed_off_by
);
276 if (cp
+ signoff_len
>= sb
->buf
+ sb
->len
)
278 if (strncmp(cp
, signoff
, signoff_len
))
280 if (!isspace(cp
[signoff_len
]))
282 /* we already have him */
288 has_signoff
= detect_any_signoff(sb
->buf
, sb
->len
);
291 strbuf_addch(sb
, '\n');
293 strbuf_addstr(sb
, signed_off_by
);
294 strbuf_add(sb
, signoff
, signoff_len
);
295 strbuf_addch(sb
, '\n');
299 static unsigned int digits_in_number(unsigned int number
)
301 unsigned int i
= 10, result
= 1;
302 while (i
<= number
) {
309 void get_patch_filename(struct commit
*commit
, const char *subject
, int nr
,
310 const char *suffix
, struct strbuf
*buf
)
312 int suffix_len
= strlen(suffix
) + 1;
313 int start_len
= buf
->len
;
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};
321 strbuf_addstr(buf
, subject
);
323 format_commit_message(commit
, "%f", buf
, &ctx
);
325 if (max_len
< buf
->len
)
326 strbuf_setlen(buf
, max_len
);
327 strbuf_addstr(buf
, suffix
);
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
)
336 const char *subject
= NULL
;
337 const char *extra_headers
= opt
->extra_headers
;
338 const char *name
= sha1_to_hex(commit
->object
.sha1
);
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] ",
346 *opt
->subject_prefix
? " " : "",
347 digits_in_number(opt
->total
),
348 opt
->nr
, opt
->total
);
350 } else if (opt
->total
== 0 && opt
->subject_prefix
&& *opt
->subject_prefix
) {
351 static char buffer
[256];
352 snprintf(buffer
, sizeof(buffer
),
354 opt
->subject_prefix
);
357 subject
= "Subject: ";
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
);
366 if (opt
->ref_message_ids
&& opt
->ref_message_ids
->nr
> 0) {
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
);
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,
382 "MIME-Version: 1.0\n"
383 "Content-Type: multipart/mixed;"
384 " boundary=\"%s%s\"\n"
386 "This is a multi-part message in MIME "
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
;
397 get_patch_filename(opt
->numbered_files
? NULL
: commit
, NULL
,
398 opt
->nr
, opt
->patch_suffix
, &filename
);
399 snprintf(buffer
, sizeof(buffer
) - 1,
401 "Content-Type: text/x-patch;"
403 "Content-Transfer-Encoding: 8bit\n"
404 "Content-Disposition: %s;"
405 " filename=\"%s\"\n\n",
406 mime_boundary_leader
, opt
->mime_boundary
,
408 opt
->no_inline
? "attachment" : "inline",
410 opt
->diffopt
.stat_sep
= buffer
;
411 strbuf_release(&filename
);
413 *subject_p
= subject
;
414 *extra_headers_p
= extra_headers
;
417 static void show_sig_lines(struct rev_info
*opt
, int status
, const char *bol
)
419 const char *color
, *reset
, *eol
;
421 color
= diff_get_color_opt(&opt
->diffopt
,
422 status
? DIFF_WHITESPACE
: DIFF_FRAGINFO
);
423 reset
= diff_get_color_opt(&opt
->diffopt
, DIFF_RESET
);
425 eol
= strchrnul(bol
, '\n');
426 printf("%s%.*s%s%s", color
, (int)(eol
- bol
), bol
, reset
,
428 bol
= (*eol
) ? (eol
+ 1) : eol
;
432 static void show_signature(struct rev_info
*opt
, struct commit
*commit
)
434 struct strbuf payload
= STRBUF_INIT
;
435 struct strbuf signature
= STRBUF_INIT
;
436 struct strbuf gpg_output
= STRBUF_INIT
;
439 if (parse_signed_commit(commit
->object
.sha1
, &payload
, &signature
) <= 0)
442 status
= verify_signed_buffer(payload
.buf
, payload
.len
,
443 signature
.buf
, signature
.len
,
445 if (status
&& !gpg_output
.len
)
446 strbuf_addstr(&gpg_output
, "No signature\n");
448 show_sig_lines(opt
, status
, gpg_output
.buf
);
451 strbuf_release(&gpg_output
);
452 strbuf_release(&payload
);
453 strbuf_release(&signature
);
456 static int which_parent(const unsigned char *sha1
, const struct commit
*commit
)
459 const struct commit_list
*parent
;
461 for (nth
= 0, parent
= commit
->parents
; parent
; parent
= parent
->next
) {
462 if (!hashcmp(parent
->item
->object
.sha1
, sha1
))
469 static int is_common_merge(const struct commit
*commit
)
471 return (commit
->parents
472 && commit
->parents
->next
473 && !commit
->parents
->next
->next
);
476 static void show_one_mergetag(struct rev_info
*opt
,
477 struct commit_extra_header
*extra
,
478 struct commit
*commit
)
480 unsigned char sha1
[20];
482 struct strbuf verify_message
;
484 size_t payload_size
, gpg_message_offset
;
486 hash_sha1_file(extra
->value
, extra
->len
, typename(OBJ_TAG
), sha1
);
487 tag
= lookup_tag(sha1
);
489 return; /* error message already given */
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
);
503 strbuf_addf(&verify_message
,
504 "parent #%d, tagged '%s'\n", nth
+ 1, tag
->tag
);
505 gpg_message_offset
= verify_message
.len
;
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
,
513 verify_message
.len
<= gpg_message_offset
)) {
514 strbuf_addstr(&verify_message
, "No signature\n");
517 else if (strstr(verify_message
.buf
+ gpg_message_offset
,
518 ": Good signature from "))
523 show_sig_lines(opt
, status
, verify_message
.buf
);
524 strbuf_release(&verify_message
);
527 static void show_mergetag(struct rev_info
*opt
, struct commit
*commit
)
529 struct commit_extra_header
*extra
, *to_free
;
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
);
537 free_commit_extra_headers(to_free
);
540 void show_log(struct rev_info
*opt
)
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};
550 if (!opt
->verbose_header
) {
551 graph_show_commit(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
)) {
563 graph_show_remainder(opt
->graph
);
565 putchar(opt
->diffopt
.line_termination
);
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)
575 if (opt
->shown_one
&& !opt
->use_terminator
) {
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.
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
588 if (opt
->diffopt
.line_termination
== '\n' &&
589 !opt
->missing_newline
)
590 graph_show_padding(opt
->graph
);
591 putchar(opt
->diffopt
.line_termination
);
596 * If the history graph was requested,
597 * print the graph, up to this commit's line
599 graph_show_commit(opt
->graph
);
602 * Print header line of header..
605 if (opt
->commit_format
== CMIT_FMT_EMAIL
) {
606 log_write_email_headers(opt
, commit
, &ctx
.subject
, &extra_headers
,
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
);
614 put_revision_mark(opt
, commit
);
615 fputs(find_unique_abbrev(commit
->object
.sha1
, abbrev_commit
),
617 if (opt
->print_parents
)
618 show_parents(commit
, abbrev_commit
);
619 if (opt
->children
.name
)
620 show_children(opt
, commit
, abbrev_commit
);
623 find_unique_abbrev(parent
->object
.sha1
,
625 show_decorations(opt
, commit
);
626 printf("%s", diff_get_color_opt(&opt
->diffopt
, DIFF_RESET
));
627 if (opt
->commit_format
== CMIT_FMT_ONELINE
) {
631 graph_show_oneline(opt
->graph
);
633 if (opt
->reflog_info
) {
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
640 show_reflog_message(opt
->reflog_info
,
641 opt
->commit_format
== CMIT_FMT_ONELINE
,
643 opt
->date_mode_explicit
);
644 if (opt
->commit_format
== CMIT_FMT_ONELINE
)
649 if (opt
->show_signature
) {
650 show_signature(opt
, commit
);
651 show_mergetag(opt
, commit
);
657 if (opt
->show_notes
) {
659 struct strbuf notebuf
= STRBUF_INIT
;
661 raw
= (opt
->commit_format
== CMIT_FMT_USERFORMAT
);
662 format_display_notes(commit
->object
.sha1
, ¬ebuf
,
663 get_log_output_encoding(), raw
);
664 ctx
.notes_message
= notebuf
.len
665 ? strbuf_detach(¬ebuf
, NULL
)
670 * And then the pretty-printed message itself
672 if (ctx
.need_8bit_cte
>= 0 && opt
->add_signoff
)
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
);
685 if (opt
->add_signoff
)
686 append_signoff(&msgbuf
, 0, APPEND_SIGNOFF_DEDUP
);
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;
694 strbuf_addstr(&msgbuf
, ctx
.notes_message
);
697 if (opt
->show_log_size
) {
698 printf("log size %i\n", (int)msgbuf
.len
);
699 graph_show_oneline(opt
->graph
);
703 * Set opt->missing_newline if msgbuf doesn't
704 * end in a newline (including if it is empty)
706 if (!msgbuf
.len
|| msgbuf
.buf
[msgbuf
.len
- 1] != '\n')
707 opt
->missing_newline
= 1;
709 opt
->missing_newline
= 0;
712 graph_show_commit_msg(opt
->graph
, &msgbuf
);
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
);
721 strbuf_release(&msgbuf
);
722 free(ctx
.notes_message
);
725 int log_tree_diff_flush(struct rev_info
*opt
)
727 opt
->shown_dashes
= 0;
728 diffcore_std(&opt
->diffopt
);
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
;
738 if (opt
->loginfo
&& !opt
->no_commit_id
) {
740 if ((opt
->diffopt
.output_format
& ~DIFF_FORMAT_NO_OUTPUT
) &&
741 opt
->verbose_header
&&
742 opt
->commit_format
!= CMIT_FMT_ONELINE
) {
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.
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
);
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.
767 if (!opt
->shown_dashes
&&
768 (pch
& opt
->diffopt
.output_format
) == pch
)
773 diff_flush(&opt
->diffopt
);
777 static int do_diff_combined(struct rev_info
*opt
, struct commit
*commit
)
779 diff_tree_combined_merge(commit
, opt
->dense_combined_merges
, opt
);
780 return !opt
->loginfo
;
784 * Show the diff of a commit.
786 * Return true if we printed any log info messages
788 static int log_tree_diff(struct rev_info
*opt
, struct commit
*commit
, struct log_info
*log
)
791 struct commit_list
*parents
;
792 unsigned const char *sha1
= commit
->object
.sha1
;
794 if (!opt
->diff
&& !DIFF_OPT_TST(&opt
->diffopt
, EXIT_WITH_STATUS
))
798 parents
= commit
->parents
;
800 if (opt
->show_root_diff
) {
801 diff_root_tree_sha1(sha1
, "", &opt
->diffopt
);
802 log_tree_diff_flush(opt
);
804 return !opt
->loginfo
;
807 /* More than one parent? */
808 if (parents
&& parents
->next
) {
809 if (opt
->ignore_merges
)
811 else if (opt
->combine_merges
)
812 return do_diff_combined(opt
, commit
);
813 else if (opt
->first_parent_only
) {
815 * Generate merge log entry only for the first
816 * parent, showing summary diff of the others
819 diff_tree_sha1(parents
->item
->object
.sha1
, sha1
, "", &opt
->diffopt
);
820 log_tree_diff_flush(opt
);
821 return !opt
->loginfo
;
824 /* If we show individual diffs, show the parent info */
825 log
->parent
= parents
->item
;
830 struct commit
*parent
= parents
->item
;
832 diff_tree_sha1(parent
->object
.sha1
, sha1
, "", &opt
->diffopt
);
833 log_tree_diff_flush(opt
);
835 showed_log
|= !opt
->loginfo
;
837 /* Set up the log info for the next parent, if any.. */
838 parents
= parents
->next
;
841 log
->parent
= parents
->item
;
847 int log_tree_commit(struct rev_info
*opt
, struct commit
*commit
)
856 shown
= log_tree_diff(opt
, commit
, &log
);
857 if (!shown
&& opt
->loginfo
&& opt
->always_show_header
) {
863 maybe_flush_or_die(stdout
, "stdout");