]> git.ipfire.org Git - thirdparty/git.git/blame - log-tree.c
log --decorate: Colorize commit decorations
[thirdparty/git.git] / log-tree.c
CommitLineData
5f1c3f07
JH
1#include "cache.h"
2#include "diff.h"
3#include "commit.h"
cab4feb6 4#include "tag.h"
7fefda5c 5#include "graph.h"
5f1c3f07 6#include "log-tree.h"
8860fd42 7#include "reflog-walk.h"
cab4feb6 8#include "refs.h"
b079c50e 9#include "string-list.h"
67a4b586 10#include "color.h"
5f1c3f07 11
ca135e7a
LT
12struct decoration name_decoration = { "object names" };
13
a7524128
NR
14enum decoration_type {
15 DECORATION_NONE = 0,
16 DECORATION_REF_LOCAL,
17 DECORATION_REF_REMOTE,
18 DECORATION_REF_TAG,
19 DECORATION_REF_STASH,
20 DECORATION_REF_HEAD,
21};
22
67a4b586
NR
23static char decoration_colors[][COLOR_MAXLEN] = {
24 GIT_COLOR_RESET,
25 GIT_COLOR_BOLD_GREEN, /* REF_LOCAL */
26 GIT_COLOR_BOLD_RED, /* REF_REMOTE */
27 GIT_COLOR_BOLD_YELLOW, /* REF_TAG */
28 GIT_COLOR_BOLD_MAGENTA, /* REF_STASH */
29 GIT_COLOR_BOLD_CYAN, /* REF_HEAD */
30};
31
32static const char *decorate_get_color(int decorate_use_color, enum decoration_type ix)
33{
34 if (decorate_use_color)
35 return decoration_colors[ix];
36 return "";
37}
38
39/*
40 * log-tree.c uses DIFF_OPT_TST for determining whether to use color
41 * for showing the commit sha1, use the same check for --decorate
42 */
43#define decorate_get_color_opt(o, ix) \
44 decorate_get_color(DIFF_OPT_TST((o), COLOR_DIFF), ix)
45
a7524128 46static void add_name_decoration(enum decoration_type type, const char *name, struct object *obj)
cab4feb6 47{
cab4feb6 48 int nlen = strlen(name);
a7524128
NR
49 struct name_decoration *res = xmalloc(sizeof(struct name_decoration) + nlen);
50 memcpy(res->name, name, nlen + 1);
51 res->type = type;
cab4feb6
RS
52 res->next = add_decoration(&name_decoration, obj, res);
53}
54
55static int add_ref_decoration(const char *refname, const unsigned char *sha1, int flags, void *cb_data)
56{
57 struct object *obj = parse_object(sha1);
a7524128 58 enum decoration_type type = DECORATION_NONE;
cab4feb6
RS
59 if (!obj)
60 return 0;
a7524128
NR
61
62 if (!prefixcmp(refname, "refs/heads"))
63 type = DECORATION_REF_LOCAL;
64 else if (!prefixcmp(refname, "refs/remotes"))
65 type = DECORATION_REF_REMOTE;
66 else if (!prefixcmp(refname, "refs/tags"))
67 type = DECORATION_REF_TAG;
68 else if (!prefixcmp(refname, "refs/stash"))
69 type = DECORATION_REF_STASH;
70 else if (!prefixcmp(refname, "HEAD"))
71 type = DECORATION_REF_HEAD;
72
33e7018c
LH
73 if (!cb_data || *(int *)cb_data == DECORATE_SHORT_REFS)
74 refname = prettify_refname(refname);
a7524128 75 add_name_decoration(type, refname, obj);
cab4feb6
RS
76 while (obj->type == OBJ_TAG) {
77 obj = ((struct tag *)obj)->tagged;
78 if (!obj)
79 break;
a7524128 80 add_name_decoration(DECORATION_REF_TAG, refname, obj);
cab4feb6
RS
81 }
82 return 0;
83}
84
33e7018c 85void load_ref_decorations(int flags)
cab4feb6
RS
86{
87 static int loaded;
88 if (!loaded) {
89 loaded = 1;
33e7018c 90 for_each_ref(add_ref_decoration, &flags);
77abcbdc 91 head_ref(add_ref_decoration, &flags);
cab4feb6
RS
92 }
93}
94
c8c893c6
LT
95static void show_parents(struct commit *commit, int abbrev)
96{
97 struct commit_list *p;
98 for (p = commit->parents; p ; p = p->next) {
99 struct commit *parent = p->item;
7fcda920 100 printf(" %s", find_unique_abbrev(parent->object.sha1, abbrev));
c8c893c6
LT
101 }
102}
103
0f3a290b 104void show_decorations(struct rev_info *opt, struct commit *commit)
ca135e7a
LT
105{
106 const char *prefix;
107 struct name_decoration *decoration;
67a4b586
NR
108 const char *color_commit =
109 diff_get_color_opt(&opt->diffopt, DIFF_COMMIT);
110 const char *color_reset =
111 decorate_get_color_opt(&opt->diffopt, DECORATION_NONE);
ca135e7a 112
0f3a290b 113 if (opt->show_source && commit->util)
8c4021ab 114 printf("\t%s", (char *) commit->util);
d467a525
LT
115 if (!opt->show_decorations)
116 return;
ca135e7a
LT
117 decoration = lookup_decoration(&name_decoration, &commit->object);
118 if (!decoration)
119 return;
120 prefix = " (";
121 while (decoration) {
a7524128 122 printf("%s", prefix);
67a4b586
NR
123 fputs(decorate_get_color_opt(&opt->diffopt, decoration->type),
124 stdout);
a7524128 125 if (decoration->type == DECORATION_REF_TAG)
67a4b586 126 fputs("tag: ", stdout);
a7524128 127 printf("%s", decoration->name);
67a4b586
NR
128 fputs(color_reset, stdout);
129 fputs(color_commit, stdout);
ca135e7a
LT
130 prefix = ", ";
131 decoration = decoration->next;
132 }
133 putchar(')');
134}
135
fc1c75ec
FBH
136/*
137 * Search for "^[-A-Za-z]+: [^@]+@" pattern. It usually matches
138 * Signed-off-by: and Acked-by: lines.
139 */
140static int detect_any_signoff(char *letter, int size)
141{
fd13b21f 142 char *cp;
fc1c75ec
FBH
143 int seen_colon = 0;
144 int seen_at = 0;
145 int seen_name = 0;
146 int seen_head = 0;
147
148 cp = letter + size;
fd13b21f 149 while (letter <= --cp && *cp == '\n')
fc1c75ec
FBH
150 continue;
151
152 while (letter <= cp) {
fd13b21f 153 char ch = *cp--;
fc1c75ec
FBH
154 if (ch == '\n')
155 break;
156
157 if (!seen_at) {
158 if (ch == '@')
159 seen_at = 1;
160 continue;
161 }
162 if (!seen_colon) {
163 if (ch == '@')
164 return 0;
165 else if (ch == ':')
166 seen_colon = 1;
167 else
168 seen_name = 1;
169 continue;
170 }
171 if (('A' <= ch && ch <= 'Z') ||
172 ('a' <= ch && ch <= 'z') ||
173 ch == '-') {
174 seen_head = 1;
175 continue;
176 }
177 /* no empty last line doesn't match */
178 return 0;
179 }
180 return seen_head && seen_name;
181}
182
674d1727 183static void append_signoff(struct strbuf *sb, const char *signoff)
cf2251b6 184{
cf2251b6 185 static const char signed_off_by[] = "Signed-off-by: ";
80583c0e 186 size_t signoff_len = strlen(signoff);
fc1c75ec 187 int has_signoff = 0;
80583c0e 188 char *cp;
cf2251b6 189
674d1727 190 cp = sb->buf;
cf2251b6
JH
191
192 /* First see if we already have the sign-off by the signer */
fc1c75ec
FBH
193 while ((cp = strstr(cp, signed_off_by))) {
194
195 has_signoff = 1;
196
cf2251b6 197 cp += strlen(signed_off_by);
674d1727 198 if (cp + signoff_len >= sb->buf + sb->len)
fc1c75ec
FBH
199 break;
200 if (strncmp(cp, signoff, signoff_len))
201 continue;
202 if (!isspace(cp[signoff_len]))
203 continue;
204 /* we already have him */
674d1727 205 return;
cf2251b6
JH
206 }
207
fc1c75ec 208 if (!has_signoff)
674d1727 209 has_signoff = detect_any_signoff(sb->buf, sb->len);
fc1c75ec
FBH
210
211 if (!has_signoff)
674d1727 212 strbuf_addch(sb, '\n');
c35f4c37 213
674d1727
PH
214 strbuf_addstr(sb, signed_off_by);
215 strbuf_add(sb, signoff, signoff_len);
216 strbuf_addch(sb, '\n');
cf2251b6
JH
217}
218
e00de24b
JS
219static unsigned int digits_in_number(unsigned int number)
220{
221 unsigned int i = 10, result = 1;
222 while (i <= number) {
223 i *= 10;
224 result++;
225 }
226 return result;
227}
228
6fa8e627
SB
229void get_patch_filename(struct commit *commit, int nr, const char *suffix,
230 struct strbuf *buf)
231{
232 int suffix_len = strlen(suffix) + 1;
233 int start_len = buf->len;
234
235 strbuf_addf(buf, commit ? "%04d-" : "%d", nr);
236 if (commit) {
b09b868f 237 int max_len = start_len + FORMAT_PATCH_NAME_MAX - suffix_len;
dd2e794a
TR
238 struct pretty_print_context ctx = {0};
239 ctx.date_mode = DATE_NORMAL;
b09b868f 240
dd2e794a 241 format_commit_message(commit, "%f", buf, &ctx);
b09b868f
CC
242 if (max_len < buf->len)
243 strbuf_setlen(buf, max_len);
244 strbuf_addstr(buf, suffix);
6fa8e627
SB
245 }
246}
247
108dab28 248void log_write_email_headers(struct rev_info *opt, struct commit *commit,
267123b4
JH
249 const char **subject_p,
250 const char **extra_headers_p,
251 int *need_8bit_cte_p)
b02bd65f
DB
252{
253 const char *subject = NULL;
254 const char *extra_headers = opt->extra_headers;
108dab28 255 const char *name = sha1_to_hex(commit->object.sha1);
267123b4
JH
256
257 *need_8bit_cte_p = 0; /* unknown */
b02bd65f
DB
258 if (opt->total > 0) {
259 static char buffer[64];
260 snprintf(buffer, sizeof(buffer),
261 "Subject: [%s %0*d/%d] ",
262 opt->subject_prefix,
263 digits_in_number(opt->total),
264 opt->nr, opt->total);
265 subject = buffer;
266 } else if (opt->total == 0 && opt->subject_prefix && *opt->subject_prefix) {
267 static char buffer[256];
268 snprintf(buffer, sizeof(buffer),
269 "Subject: [%s] ",
270 opt->subject_prefix);
271 subject = buffer;
272 } else {
273 subject = "Subject: ";
274 }
275
276 printf("From %s Mon Sep 17 00:00:00 2001\n", name);
7fefda5c
AS
277 graph_show_oneline(opt->graph);
278 if (opt->message_id) {
b02bd65f 279 printf("Message-Id: <%s>\n", opt->message_id);
7fefda5c
AS
280 graph_show_oneline(opt->graph);
281 }
b079c50e
TR
282 if (opt->ref_message_ids && opt->ref_message_ids->nr > 0) {
283 int i, n;
284 n = opt->ref_message_ids->nr;
285 printf("In-Reply-To: <%s>\n", opt->ref_message_ids->items[n-1].string);
286 for (i = 0; i < n; i++)
287 printf("%s<%s>\n", (i > 0 ? "\t" : "References: "),
288 opt->ref_message_ids->items[i].string);
7fefda5c
AS
289 graph_show_oneline(opt->graph);
290 }
b02bd65f
DB
291 if (opt->mime_boundary) {
292 static char subject_buffer[1024];
293 static char buffer[1024];
108dab28 294 struct strbuf filename = STRBUF_INIT;
267123b4 295 *need_8bit_cte_p = -1; /* NEVER */
b02bd65f
DB
296 snprintf(subject_buffer, sizeof(subject_buffer) - 1,
297 "%s"
298 "MIME-Version: 1.0\n"
299 "Content-Type: multipart/mixed;"
300 " boundary=\"%s%s\"\n"
301 "\n"
302 "This is a multi-part message in MIME "
303 "format.\n"
304 "--%s%s\n"
305 "Content-Type: text/plain; "
306 "charset=UTF-8; format=fixed\n"
307 "Content-Transfer-Encoding: 8bit\n\n",
308 extra_headers ? extra_headers : "",
309 mime_boundary_leader, opt->mime_boundary,
310 mime_boundary_leader, opt->mime_boundary);
311 extra_headers = subject_buffer;
312
108dab28
SB
313 get_patch_filename(opt->numbered_files ? NULL : commit, opt->nr,
314 opt->patch_suffix, &filename);
b02bd65f 315 snprintf(buffer, sizeof(buffer) - 1,
6b2fbaaf 316 "\n--%s%s\n"
b02bd65f 317 "Content-Type: text/x-patch;"
108dab28 318 " name=\"%s\"\n"
b02bd65f
DB
319 "Content-Transfer-Encoding: 8bit\n"
320 "Content-Disposition: %s;"
108dab28 321 " filename=\"%s\"\n\n",
b02bd65f 322 mime_boundary_leader, opt->mime_boundary,
108dab28 323 filename.buf,
b02bd65f 324 opt->no_inline ? "attachment" : "inline",
108dab28 325 filename.buf);
b02bd65f 326 opt->diffopt.stat_sep = buffer;
108dab28 327 strbuf_release(&filename);
b02bd65f
DB
328 }
329 *subject_p = subject;
330 *extra_headers_p = extra_headers;
331}
332
02865655 333void show_log(struct rev_info *opt)
91539833 334{
f285a2d7 335 struct strbuf msgbuf = STRBUF_INIT;
39bc9a6c 336 struct log_info *log = opt->loginfo;
91539833 337 struct commit *commit = log->commit, *parent = log->parent;
91539833 338 int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
dd2e794a
TR
339 const char *extra_headers = opt->extra_headers;
340 struct pretty_print_context ctx = {0};
91539833
LT
341
342 opt->loginfo = NULL;
66b2ed09 343 ctx.show_notes = opt->show_notes;
91539833 344 if (!opt->verbose_header) {
7fefda5c
AS
345 graph_show_commit(opt->graph);
346
7528f27d
AS
347 if (!opt->graph) {
348 if (commit->object.flags & BOUNDARY)
349 putchar('-');
350 else if (commit->object.flags & UNINTERESTING)
351 putchar('^');
352 else if (opt->left_right) {
353 if (commit->object.flags & SYMMETRIC_LEFT)
354 putchar('<');
355 else
356 putchar('>');
357 }
74bd9029 358 }
7fcda920 359 fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit), stdout);
885cf808 360 if (opt->print_parents)
c8c893c6 361 show_parents(commit, abbrev_commit);
0f3a290b 362 show_decorations(opt, commit);
7fefda5c
AS
363 if (opt->graph && !graph_is_commit_finished(opt->graph)) {
364 putchar('\n');
365 graph_show_remainder(opt->graph);
366 }
1dcb6922 367 putchar(opt->diffopt.line_termination);
91539833
LT
368 return;
369 }
370
371 /*
8715227d
JK
372 * If use_terminator is set, we already handled any record termination
373 * at the end of the last record.
02865655
AS
374 * Otherwise, add a diffopt.line_termination character before all
375 * entries but the first. (IOW, as a separator between entries)
91539833 376 */
7fefda5c
AS
377 if (opt->shown_one && !opt->use_terminator) {
378 /*
379 * If entries are separated by a newline, the output
380 * should look human-readable. If the last entry ended
381 * with a newline, print the graph output before this
382 * newline. Otherwise it will end up as a completely blank
383 * line and will look like a gap in the graph.
384 *
385 * If the entry separator is not a newline, the output is
386 * primarily intended for programmatic consumption, and we
387 * never want the extra graph output before the entry
388 * separator.
389 */
390 if (opt->diffopt.line_termination == '\n' &&
391 !opt->missing_newline)
392 graph_show_padding(opt->graph);
abd4e222 393 putchar(opt->diffopt.line_termination);
7fefda5c 394 }
91539833
LT
395 opt->shown_one = 1;
396
7fefda5c
AS
397 /*
398 * If the history graph was requested,
399 * print the graph, up to this commit's line
400 */
401 graph_show_commit(opt->graph);
402
91539833
LT
403 /*
404 * Print header line of header..
405 */
3eefc189 406
596524b3 407 if (opt->commit_format == CMIT_FMT_EMAIL) {
dd2e794a
TR
408 log_write_email_headers(opt, commit, &ctx.subject, &extra_headers,
409 &ctx.need_8bit_cte);
e52a5de4 410 } else if (opt->commit_format != CMIT_FMT_USERFORMAT) {
8f67f8ae 411 fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), stdout);
74bd9029
JH
412 if (opt->commit_format != CMIT_FMT_ONELINE)
413 fputs("commit ", stdout);
7528f27d
AS
414
415 if (!opt->graph) {
416 if (commit->object.flags & BOUNDARY)
417 putchar('-');
418 else if (commit->object.flags & UNINTERESTING)
419 putchar('^');
420 else if (opt->left_right) {
421 if (commit->object.flags & SYMMETRIC_LEFT)
422 putchar('<');
423 else
424 putchar('>');
425 }
74bd9029 426 }
7fcda920 427 fputs(find_unique_abbrev(commit->object.sha1, abbrev_commit),
74bd9029 428 stdout);
885cf808 429 if (opt->print_parents)
c66b6c06 430 show_parents(commit, abbrev_commit);
73f0a157 431 if (parent)
3eefc189 432 printf(" (from %s)",
7fcda920 433 find_unique_abbrev(parent->object.sha1,
3eefc189 434 abbrev_commit));
0f3a290b 435 show_decorations(opt, commit);
8f67f8ae 436 printf("%s", diff_get_color_opt(&opt->diffopt, DIFF_RESET));
7fefda5c
AS
437 if (opt->commit_format == CMIT_FMT_ONELINE) {
438 putchar(' ');
439 } else {
440 putchar('\n');
441 graph_show_oneline(opt->graph);
442 }
903b45fe 443 if (opt->reflog_info) {
7fefda5c
AS
444 /*
445 * setup_revisions() ensures that opt->reflog_info
446 * and opt->graph cannot both be set,
447 * so we don't need to worry about printing the
448 * graph info here.
449 */
4d12a471 450 show_reflog_message(opt->reflog_info,
4e244cbc 451 opt->commit_format == CMIT_FMT_ONELINE,
f4ea32f0
JK
452 opt->date_mode_explicit ?
453 opt->date_mode :
454 DATE_NORMAL);
02865655 455 if (opt->commit_format == CMIT_FMT_ONELINE)
903b45fe 456 return;
903b45fe 457 }
3eefc189 458 }
91539833 459
3131b713
LT
460 if (!commit->buffer)
461 return;
462
91539833
LT
463 /*
464 * And then the pretty-printed message itself
465 */
dd2e794a
TR
466 if (ctx.need_8bit_cte >= 0)
467 ctx.need_8bit_cte = has_non_ascii(opt->add_signoff);
468 ctx.date_mode = opt->date_mode;
469 ctx.abbrev = opt->diffopt.abbrev;
470 ctx.after_subject = extra_headers;
8f8f5476 471 ctx.reflog_info = opt->reflog_info;
dd2e794a 472 pretty_print_commit(opt->commit_format, commit, &msgbuf, &ctx);
cf2251b6
JH
473
474 if (opt->add_signoff)
674d1727 475 append_signoff(&msgbuf, opt->add_signoff);
7fefda5c 476 if (opt->show_log_size) {
674d1727 477 printf("log size %i\n", (int)msgbuf.len);
7fefda5c
AS
478 graph_show_oneline(opt->graph);
479 }
9fa3465d 480
7fefda5c
AS
481 /*
482 * Set opt->missing_newline if msgbuf doesn't
483 * end in a newline (including if it is empty)
484 */
485 if (!msgbuf.len || msgbuf.buf[msgbuf.len - 1] != '\n')
486 opt->missing_newline = 1;
487 else
488 opt->missing_newline = 0;
489
490 if (opt->graph)
491 graph_show_commit_msg(opt->graph, &msgbuf);
492 else
42c8c74c 493 fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
7fefda5c
AS
494 if (opt->use_terminator) {
495 if (!opt->missing_newline)
496 graph_show_padding(opt->graph);
9b58bfe8 497 putchar('\n');
7fefda5c
AS
498 }
499
674d1727 500 strbuf_release(&msgbuf);
91539833
LT
501}
502
cd2bdc53 503int log_tree_diff_flush(struct rev_info *opt)
5f1c3f07
JH
504{
505 diffcore_std(&opt->diffopt);
91539833 506
5f1c3f07
JH
507 if (diff_queue_is_empty()) {
508 int saved_fmt = opt->diffopt.output_format;
509 opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
510 diff_flush(&opt->diffopt);
511 opt->diffopt.output_format = saved_fmt;
512 return 0;
513 }
91539833 514
3969cf7d
JH
515 if (opt->loginfo && !opt->no_commit_id) {
516 /* When showing a verbose header (i.e. log message),
517 * and not in --pretty=oneline format, we would want
518 * an extra newline between the end of log and the
519 * output for readability.
520 */
02865655 521 show_log(opt);
304b5af6
LT
522 if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) &&
523 opt->verbose_header &&
3969cf7d
JH
524 opt->commit_format != CMIT_FMT_ONELINE) {
525 int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
526 if ((pch & opt->diffopt.output_format) == pch)
abd4e222 527 printf("---");
81bd1b2a
BY
528 if (opt->diffopt.output_prefix) {
529 struct strbuf *msg = NULL;
530 msg = opt->diffopt.output_prefix(&opt->diffopt,
531 opt->diffopt.output_prefix_data);
532 fwrite(msg->buf, msg->len, 1, stdout);
533 }
abd4e222 534 putchar('\n');
3969cf7d
JH
535 }
536 }
5f1c3f07
JH
537 diff_flush(&opt->diffopt);
538 return 1;
539}
540
cd2bdc53 541static int do_diff_combined(struct rev_info *opt, struct commit *commit)
5f1c3f07
JH
542{
543 unsigned const char *sha1 = commit->object.sha1;
544
91539833
LT
545 diff_tree_combined_merge(sha1, opt->dense_combined_merges, opt);
546 return !opt->loginfo;
5f1c3f07
JH
547}
548
91539833
LT
549/*
550 * Show the diff of a commit.
551 *
552 * Return true if we printed any log info messages
553 */
554static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log_info *log)
5f1c3f07 555{
91539833 556 int showed_log;
5f1c3f07
JH
557 struct commit_list *parents;
558 unsigned const char *sha1 = commit->object.sha1;
559
84102a33 560 if (!opt->diff && !DIFF_OPT_TST(&opt->diffopt, EXIT_WITH_STATUS))
91539833
LT
561 return 0;
562
5f1c3f07 563 /* Root commit? */
91539833
LT
564 parents = commit->parents;
565 if (!parents) {
2b60356d
RS
566 if (opt->show_root_diff) {
567 diff_root_tree_sha1(sha1, "", &opt->diffopt);
568 log_tree_diff_flush(opt);
569 }
91539833 570 return !opt->loginfo;
5f1c3f07
JH
571 }
572
573 /* More than one parent? */
91539833 574 if (parents && parents->next) {
5f1c3f07
JH
575 if (opt->ignore_merges)
576 return 0;
577 else if (opt->combine_merges)
578 return do_diff_combined(opt, commit);
88d9d45d
PB
579 else if (opt->first_parent_only) {
580 /*
581 * Generate merge log entry only for the first
582 * parent, showing summary diff of the others
583 * we merged _in_.
584 */
585 diff_tree_sha1(parents->item->object.sha1, sha1, "", &opt->diffopt);
586 log_tree_diff_flush(opt);
587 return !opt->loginfo;
588 }
91539833
LT
589
590 /* If we show individual diffs, show the parent info */
591 log->parent = parents->item;
5f1c3f07
JH
592 }
593
91539833
LT
594 showed_log = 0;
595 for (;;) {
5f1c3f07 596 struct commit *parent = parents->item;
5f1c3f07 597
91539833
LT
598 diff_tree_sha1(parent->object.sha1, sha1, "", &opt->diffopt);
599 log_tree_diff_flush(opt);
600
601 showed_log |= !opt->loginfo;
602
603 /* Set up the log info for the next parent, if any.. */
604 parents = parents->next;
605 if (!parents)
606 break;
607 log->parent = parents->item;
608 opt->loginfo = log;
609 }
610 return showed_log;
611}
612
613int log_tree_commit(struct rev_info *opt, struct commit *commit)
614{
615 struct log_info log;
3eefc189 616 int shown;
91539833
LT
617
618 log.commit = commit;
619 log.parent = NULL;
620 opt->loginfo = &log;
621
3eefc189
JH
622 shown = log_tree_diff(opt, commit, &log);
623 if (!shown && opt->loginfo && opt->always_show_header) {
91539833 624 log.parent = NULL;
02865655 625 show_log(opt);
3eefc189 626 shown = 1;
5f1c3f07 627 }
91539833 628 opt->loginfo = NULL;
06f59e9f 629 maybe_flush_or_die(stdout, "stdout");
3eefc189 630 return shown;
5f1c3f07 631}