6 void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
8 static char this_header[16384];
9 struct commit *commit = log->commit, *parent = log->parent;
10 int abbrev = opt->diffopt.abbrev;
11 int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
16 if (!opt->verbose_header) {
17 puts(sha1_to_hex(commit->object.sha1));
22 * The "oneline" format has several special cases:
23 * - The pretty-printed commit lacks a newline at the end
24 * of the buffer, but we do want to make sure that we
25 * have a newline there. If the separator isn't already
26 * a newline, add an extra one.
27 * - unlike other log messages, the one-line format does
28 * not have an empty line between entries.
31 if (*sep != '\n' && opt->commit_format == CMIT_FMT_ONELINE)
33 if (opt->shown_one && opt->commit_format != CMIT_FMT_ONELINE)
38 * Print header line of header..
41 opt->commit_format == CMIT_FMT_ONELINE ? "" : "commit ",
42 diff_unique_abbrev(commit->object.sha1, abbrev_commit));
44 printf(" (from %s)", diff_unique_abbrev(parent->object.sha1, abbrev_commit));
45 putchar(opt->commit_format == CMIT_FMT_ONELINE ? ' ' : '\n');
48 * And then the pretty-printed message itself
50 len = pretty_print_commit(opt->commit_format, commit, ~0u, this_header, sizeof(this_header), abbrev);
51 printf("%s%s%s", this_header, extra, sep);
54 int log_tree_diff_flush(struct rev_info *opt)
56 diffcore_std(&opt->diffopt);
58 if (diff_queue_is_empty()) {
59 int saved_fmt = opt->diffopt.output_format;
60 opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
61 diff_flush(&opt->diffopt);
62 opt->diffopt.output_format = saved_fmt;
66 if (opt->loginfo && !opt->no_commit_id)
67 show_log(opt, opt->loginfo, opt->diffopt.with_stat ? "---\n" : "\n");
68 diff_flush(&opt->diffopt);
72 static int diff_root_tree(struct rev_info *opt,
73 const unsigned char *new, const char *base)
77 struct tree_desc empty, real;
79 tree = read_object_with_reference(new, tree_type, &real.size, NULL);
81 die("unable to read root tree (%s)", sha1_to_hex(new));
86 retval = diff_tree(&empty, &real, base, &opt->diffopt);
88 log_tree_diff_flush(opt);
92 static int do_diff_combined(struct rev_info *opt, struct commit *commit)
94 unsigned const char *sha1 = commit->object.sha1;
96 diff_tree_combined_merge(sha1, opt->dense_combined_merges, opt);
101 * Show the diff of a commit.
103 * Return true if we printed any log info messages
105 static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log_info *log)
108 struct commit_list *parents;
109 unsigned const char *sha1 = commit->object.sha1;
115 parents = commit->parents;
117 if (opt->show_root_diff)
118 diff_root_tree(opt, sha1, "");
119 return !opt->loginfo;
122 /* More than one parent? */
123 if (parents && parents->next) {
124 if (opt->ignore_merges)
126 else if (opt->combine_merges)
127 return do_diff_combined(opt, commit);
129 /* If we show individual diffs, show the parent info */
130 log->parent = parents->item;
135 struct commit *parent = parents->item;
137 diff_tree_sha1(parent->object.sha1, sha1, "", &opt->diffopt);
138 log_tree_diff_flush(opt);
140 showed_log |= !opt->loginfo;
142 /* Set up the log info for the next parent, if any.. */
143 parents = parents->next;
146 log->parent = parents->item;
152 int log_tree_commit(struct rev_info *opt, struct commit *commit)
160 if (!log_tree_diff(opt, commit, &log) && opt->loginfo && opt->always_show_header) {
162 show_log(opt, opt->loginfo, "");