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