blob: 25165e2a915e0394cbfc2347d5f3eca83842beff [file] [log] [blame]
Junio C Hamano5f1c3f02006-04-09 01:11:11 -07001#include "cache.h"
Elijah Newrendb757e82022-02-02 02:37:28 +00002#include "commit-reach.h"
Brandon Williamsb2141fc2017-06-14 11:07:36 -07003#include "config.h"
Junio C Hamano5f1c3f02006-04-09 01:11:11 -07004#include "diff.h"
Stefan Bellercbd53a22018-05-15 16:42:15 -07005#include "object-store.h"
Stefan Beller109cd762018-06-28 18:21:51 -07006#include "repository.h"
Elijah Newren7b90ab42022-02-02 02:37:29 +00007#include "tmp-objdir.h"
Junio C Hamano5f1c3f02006-04-09 01:11:11 -07008#include "commit.h"
René Scharfecab4feb2008-09-04 23:39:21 +02009#include "tag.h"
Adam Simpkins7fefda52008-05-04 03:36:54 -070010#include "graph.h"
Junio C Hamano5f1c3f02006-04-09 01:11:11 -070011#include "log-tree.h"
Elijah Newrendb757e82022-02-02 02:37:28 +000012#include "merge-ort.h"
Johannes Schindelin8860fd42007-01-11 11:47:48 +010013#include "reflog-walk.h"
René Scharfecab4feb2008-09-04 23:39:21 +020014#include "refs.h"
Thomas Rastb079c502009-02-19 22:26:31 +010015#include "string-list.h"
Nazri Ramliy67a4b582010-06-19 09:37:35 +080016#include "color.h"
Junio C Hamano0c37f1f2011-10-18 15:53:23 -070017#include "gpg-interface.h"
Brandon Casey959a2622013-02-12 02:17:39 -080018#include "sequencer.h"
Thomas Rast12da1d12013-03-28 17:47:32 +010019#include "line-log.h"
Nguyễn Thái Ngọc Duy3ac68a92018-05-26 15:55:24 +020020#include "help.h"
Eric Sunshine40ce4162018-07-22 05:57:17 -040021#include "range-diff.h"
Elijah Newren20323d12022-02-02 02:37:35 +000022#include "strmap.h"
Junio C Hamano5f1c3f02006-04-09 01:11:11 -070023
Jeff King2608c242014-08-26 06:23:54 -040024static struct decoration name_decoration = { "object names" };
Junio C Hamano76c61fb2015-05-13 10:25:18 -070025static int decoration_loaded;
26static int decoration_flags;
Nazri Ramliya7524122010-06-19 09:37:34 +080027
Nazri Ramliy67a4b582010-06-19 09:37:35 +080028static char decoration_colors[][COLOR_MAXLEN] = {
29 GIT_COLOR_RESET,
30 GIT_COLOR_BOLD_GREEN, /* REF_LOCAL */
31 GIT_COLOR_BOLD_RED, /* REF_REMOTE */
32 GIT_COLOR_BOLD_YELLOW, /* REF_TAG */
33 GIT_COLOR_BOLD_MAGENTA, /* REF_STASH */
34 GIT_COLOR_BOLD_CYAN, /* REF_HEAD */
Nguyễn Thái Ngọc Duy76f5df32011-08-18 19:29:37 +070035 GIT_COLOR_BOLD_BLUE, /* GRAFTED */
Nazri Ramliy67a4b582010-06-19 09:37:35 +080036};
37
Nguyễn Thái Ngọc Duya73b3682018-05-26 15:55:21 +020038static const char *color_decorate_slots[] = {
39 [DECORATION_REF_LOCAL] = "branch",
40 [DECORATION_REF_REMOTE] = "remoteBranch",
41 [DECORATION_REF_TAG] = "tag",
42 [DECORATION_REF_STASH] = "stash",
43 [DECORATION_REF_HEAD] = "HEAD",
Nguyễn Thái Ngọc Duy09c4ba42018-05-26 15:55:31 +020044 [DECORATION_GRAFTED] = "grafted",
Nguyễn Thái Ngọc Duya73b3682018-05-26 15:55:21 +020045};
46
Nazri Ramliy67a4b582010-06-19 09:37:35 +080047static const char *decorate_get_color(int decorate_use_color, enum decoration_type ix)
48{
Jeff Kingdaa0c3d2011-08-17 22:04:23 -070049 if (want_color(decorate_use_color))
Nazri Ramliy67a4b582010-06-19 09:37:35 +080050 return decoration_colors[ix];
51 return "";
52}
53
Nguyễn Thái Ngọc Duy3ac68a92018-05-26 15:55:24 +020054define_list_config_array(color_decorate_slots);
Nazri Ramliy5e11bee2010-06-24 08:21:16 +080055
Jonathan Nieder88521172014-10-07 15:16:57 -040056int parse_decorate_color_config(const char *var, const char *slot_name, const char *value)
Nazri Ramliy5e11bee2010-06-24 08:21:16 +080057{
Nguyễn Thái Ngọc Duya73b3682018-05-26 15:55:21 +020058 int slot = LOOKUP_CONFIG(color_decorate_slots, slot_name);
Nazri Ramliy5e11bee2010-06-24 08:21:16 +080059 if (slot < 0)
60 return 0;
61 if (!value)
62 return config_error_nonbool(var);
Jeff Kingf6c5a292014-10-07 15:33:09 -040063 return color_parse(value, decoration_colors[slot]);
Nazri Ramliy5e11bee2010-06-24 08:21:16 +080064}
65
Nazri Ramliy67a4b582010-06-19 09:37:35 +080066/*
67 * log-tree.c uses DIFF_OPT_TST for determining whether to use color
68 * for showing the commit sha1, use the same check for --decorate
69 */
70#define decorate_get_color_opt(o, ix) \
Jeff Kingf1c96262011-08-17 22:03:12 -070071 decorate_get_color((o)->use_color, ix)
Nazri Ramliy67a4b582010-06-19 09:37:35 +080072
Jeff King662174d2014-08-26 06:23:36 -040073void add_name_decoration(enum decoration_type type, const char *name, struct object *obj)
René Scharfecab4feb2008-09-04 23:39:21 +020074{
Jeff King96ffc062016-02-22 17:44:32 -050075 struct name_decoration *res;
76 FLEX_ALLOC_STR(res, name, name);
Nazri Ramliya7524122010-06-19 09:37:34 +080077 res->type = type;
René Scharfecab4feb2008-09-04 23:39:21 +020078 res->next = add_decoration(&name_decoration, obj, res);
79}
80
Jeff King2608c242014-08-26 06:23:54 -040081const struct name_decoration *get_name_decoration(const struct object *obj)
82{
René Scharfe0cc73802019-09-08 19:58:51 +020083 load_ref_decorations(NULL, DECORATE_SHORT_REFS);
Jeff King2608c242014-08-26 06:23:54 -040084 return lookup_decoration(&name_decoration, obj);
85}
86
Derrick Stoleec9f7a792020-04-16 14:15:48 +000087static int match_ref_pattern(const char *refname,
88 const struct string_list_item *item)
89{
90 int matched = 0;
91 if (item->util == NULL) {
92 if (!wildmatch(item->string, refname, 0))
93 matched = 1;
94 } else {
95 const char *rest;
96 if (skip_prefix(refname, item->string, &rest) &&
97 (!*rest || *rest == '/'))
98 matched = 1;
99 }
100 return matched;
101}
102
103static int ref_filter_match(const char *refname,
104 const struct decoration_filter *filter)
105{
106 struct string_list_item *item;
107 const struct string_list *exclude_patterns = filter->exclude_ref_pattern;
108 const struct string_list *include_patterns = filter->include_ref_pattern;
Derrick Stoleea6be5e62020-04-16 14:15:49 +0000109 const struct string_list *exclude_patterns_config =
110 filter->exclude_ref_config_pattern;
Derrick Stoleec9f7a792020-04-16 14:15:48 +0000111
112 if (exclude_patterns && exclude_patterns->nr) {
113 for_each_string_list_item(item, exclude_patterns) {
114 if (match_ref_pattern(refname, item))
115 return 0;
116 }
117 }
118
119 if (include_patterns && include_patterns->nr) {
Derrick Stoleec9f7a792020-04-16 14:15:48 +0000120 for_each_string_list_item(item, include_patterns) {
Derrick Stoleea6be5e62020-04-16 14:15:49 +0000121 if (match_ref_pattern(refname, item))
122 return 1;
Derrick Stoleec9f7a792020-04-16 14:15:48 +0000123 }
Derrick Stoleea6be5e62020-04-16 14:15:49 +0000124 return 0;
Derrick Stoleec9f7a792020-04-16 14:15:48 +0000125 }
Derrick Stoleea6be5e62020-04-16 14:15:49 +0000126
127 if (exclude_patterns_config && exclude_patterns_config->nr) {
128 for_each_string_list_item(item, exclude_patterns_config) {
129 if (match_ref_pattern(refname, item))
130 return 0;
131 }
132 }
133
Derrick Stoleec9f7a792020-04-16 14:15:48 +0000134 return 1;
135}
136
Michael Haggertyf124b732015-05-25 18:38:57 +0000137static int add_ref_decoration(const char *refname, const struct object_id *oid,
138 int flags, void *cb_data)
René Scharfecab4feb2008-09-04 23:39:21 +0200139{
Nguyễn Thái Ngọc Duy5267d292011-08-19 19:43:50 +0700140 struct object *obj;
Jeff King88473c82021-06-22 13:06:48 -0400141 enum object_type objtype;
Jeff King6afb2652021-06-22 13:09:26 -0400142 enum decoration_type deco_type = DECORATION_NONE;
Rafael Ascensão65516f52017-11-21 21:33:41 +0000143 struct decoration_filter *filter = (struct decoration_filter *)cb_data;
Nguyễn Thái Ngọc Duy5267d292011-08-19 19:43:50 +0700144
Derrick Stoleec9f7a792020-04-16 14:15:48 +0000145 if (filter && !ref_filter_match(refname, filter))
Rafael Ascensão65516f52017-11-21 21:33:41 +0000146 return 0;
Junio C Hamano429ad202015-05-13 12:40:35 -0700147
Mike Hommey58d121b2015-06-12 06:34:59 +0900148 if (starts_with(refname, git_replace_ref_base)) {
Michael Haggerty3d79f652015-05-25 18:38:58 +0000149 struct object_id original_oid;
Jeff King6ebd1ca2018-07-18 16:45:20 -0400150 if (!read_replace_refs)
Michael J Gruberb9ad5002011-08-25 17:09:30 +0200151 return 0;
Junio C Hamano31a0ad52015-08-03 11:01:10 -0700152 if (get_oid_hex(refname + strlen(git_replace_ref_base),
153 &original_oid)) {
Nguyễn Thái Ngọc Duy5267d292011-08-19 19:43:50 +0700154 warning("invalid replace ref %s", refname);
155 return 0;
156 }
Stefan Beller109cd762018-06-28 18:21:51 -0700157 obj = parse_object(the_repository, &original_oid);
Nguyễn Thái Ngọc Duy5267d292011-08-19 19:43:50 +0700158 if (obj)
159 add_name_decoration(DECORATION_GRAFTED, "replaced", obj);
160 return 0;
161 }
162
Jeff King88473c82021-06-22 13:06:48 -0400163 objtype = oid_object_info(the_repository, oid, NULL);
164 if (objtype < 0)
René Scharfecab4feb2008-09-04 23:39:21 +0200165 return 0;
Jeff King88473c82021-06-22 13:06:48 -0400166 obj = lookup_object_by_type(the_repository, oid, objtype);
Nazri Ramliya7524122010-06-19 09:37:34 +0800167
Christian Couder59556542013-11-30 21:55:40 +0100168 if (starts_with(refname, "refs/heads/"))
Jeff King6afb2652021-06-22 13:09:26 -0400169 deco_type = DECORATION_REF_LOCAL;
Christian Couder59556542013-11-30 21:55:40 +0100170 else if (starts_with(refname, "refs/remotes/"))
Jeff King6afb2652021-06-22 13:09:26 -0400171 deco_type = DECORATION_REF_REMOTE;
Christian Couder59556542013-11-30 21:55:40 +0100172 else if (starts_with(refname, "refs/tags/"))
Jeff King6afb2652021-06-22 13:09:26 -0400173 deco_type = DECORATION_REF_TAG;
Nguyễn Thái Ngọc Duy97ba6422012-01-05 19:39:40 +0700174 else if (!strcmp(refname, "refs/stash"))
Jeff King6afb2652021-06-22 13:09:26 -0400175 deco_type = DECORATION_REF_STASH;
Nguyễn Thái Ngọc Duy97ba6422012-01-05 19:39:40 +0700176 else if (!strcmp(refname, "HEAD"))
Jeff King6afb2652021-06-22 13:09:26 -0400177 deco_type = DECORATION_REF_HEAD;
Nazri Ramliya7524122010-06-19 09:37:34 +0800178
Jeff King6afb2652021-06-22 13:09:26 -0400179 add_name_decoration(deco_type, refname, obj);
René Scharfecab4feb2008-09-04 23:39:21 +0200180 while (obj->type == OBJ_TAG) {
Jeff Kingd1ed8d62021-07-14 12:31:36 -0400181 if (!obj->parsed)
182 parse_object(the_repository, &obj->oid);
René Scharfecab4feb2008-09-04 23:39:21 +0200183 obj = ((struct tag *)obj)->tagged;
184 if (!obj)
185 break;
Nazri Ramliya7524122010-06-19 09:37:34 +0800186 add_name_decoration(DECORATION_REF_TAG, refname, obj);
René Scharfecab4feb2008-09-04 23:39:21 +0200187 }
188 return 0;
189}
190
Nguyễn Thái Ngọc Duy76f5df32011-08-18 19:29:37 +0700191static int add_graft_decoration(const struct commit_graft *graft, void *cb_data)
192{
Stefan Bellerc1f5eb42018-06-28 18:21:59 -0700193 struct commit *commit = lookup_commit(the_repository, &graft->oid);
Nguyễn Thái Ngọc Duy76f5df32011-08-18 19:29:37 +0700194 if (!commit)
195 return 0;
196 add_name_decoration(DECORATION_GRAFTED, "grafted", &commit->object);
197 return 0;
198}
199
Rafael Ascensão65516f52017-11-21 21:33:41 +0000200void load_ref_decorations(struct decoration_filter *filter, int flags)
René Scharfecab4feb2008-09-04 23:39:21 +0200201{
Junio C Hamano76c61fb2015-05-13 10:25:18 -0700202 if (!decoration_loaded) {
Rafael Ascensão65516f52017-11-21 21:33:41 +0000203 if (filter) {
204 struct string_list_item *item;
205 for_each_string_list_item(item, filter->exclude_ref_pattern) {
206 normalize_glob_ref(item, NULL, item->string);
207 }
208 for_each_string_list_item(item, filter->include_ref_pattern) {
209 normalize_glob_ref(item, NULL, item->string);
210 }
Derrick Stoleea6be5e62020-04-16 14:15:49 +0000211 for_each_string_list_item(item, filter->exclude_ref_config_pattern) {
212 normalize_glob_ref(item, NULL, item->string);
213 }
Rafael Ascensão65516f52017-11-21 21:33:41 +0000214 }
Junio C Hamano76c61fb2015-05-13 10:25:18 -0700215 decoration_loaded = 1;
216 decoration_flags = flags;
Rafael Ascensão65516f52017-11-21 21:33:41 +0000217 for_each_ref(add_ref_decoration, filter);
218 head_ref(add_ref_decoration, filter);
219 for_each_commit_graft(add_graft_decoration, filter);
René Scharfecab4feb2008-09-04 23:39:21 +0200220 }
221}
222
Johannes Schindelin4d7b0ef2016-06-22 17:01:32 +0200223static void show_parents(struct commit *commit, int abbrev, FILE *file)
Linus Torvaldsc8c893c2006-05-03 07:59:00 -0700224{
225 struct commit_list *p;
226 for (p = commit->parents; p ; p = p->next) {
227 struct commit *parent = p->item;
brian m. carlsonaab95832018-03-12 02:27:30 +0000228 fprintf(file, " %s", find_unique_abbrev(&parent->object.oid, abbrev));
Linus Torvaldsc8c893c2006-05-03 07:59:00 -0700229 }
230}
231
Jay Soffian91b849b2011-10-04 10:02:03 -0400232static void show_children(struct rev_info *opt, struct commit *commit, int abbrev)
233{
234 struct commit_list *p = lookup_decoration(&opt->children, &commit->object);
235 for ( ; p; p = p->next) {
brian m. carlsonaab95832018-03-12 02:27:30 +0000236 fprintf(opt->diffopt.file, " %s", find_unique_abbrev(&p->item->object.oid, abbrev));
Jay Soffian91b849b2011-10-04 10:02:03 -0400237 }
238}
239
Nguyễn Thái Ngọc Duy9d3f0022013-04-19 09:08:43 +1000240/*
Junio C Hamano51ff0f22015-03-10 14:53:21 +0100241 * Do we have HEAD in the output, and also the branch it points at?
242 * If so, find that decoration entry for that current branch.
243 */
244static const struct name_decoration *current_pointed_by_HEAD(const struct name_decoration *decoration)
245{
246 const struct name_decoration *list, *head = NULL;
247 const char *branch_name = NULL;
Junio C Hamano51ff0f22015-03-10 14:53:21 +0100248 int rru_flags;
249
250 /* First find HEAD */
251 for (list = decoration; list; list = list->next)
252 if (list->type == DECORATION_REF_HEAD) {
253 head = list;
254 break;
255 }
256 if (!head)
257 return NULL;
258
259 /* Now resolve and find the matching current branch */
René Scharfe744c0402017-09-23 11:45:04 +0200260 branch_name = resolve_ref_unsafe("HEAD", 0, NULL, &rru_flags);
Jeff Kingd79be492017-10-19 13:49:01 -0400261 if (!branch_name || !(rru_flags & REF_ISSYMREF))
Junio C Hamano51ff0f22015-03-10 14:53:21 +0100262 return NULL;
Junio C Hamano76c61fb2015-05-13 10:25:18 -0700263
Junio C Hamano429ad202015-05-13 12:40:35 -0700264 if (!starts_with(branch_name, "refs/"))
Junio C Hamano51ff0f22015-03-10 14:53:21 +0100265 return NULL;
266
267 /* OK, do we have that ref in the list? */
268 for (list = decoration; list; list = list->next)
269 if ((list->type == DECORATION_REF_LOCAL) &&
270 !strcmp(branch_name, list->name)) {
271 return list;
272 }
273
274 return NULL;
275}
276
Junio C Hamano429ad202015-05-13 12:40:35 -0700277static void show_name(struct strbuf *sb, const struct name_decoration *decoration)
278{
279 if (decoration_flags == DECORATE_SHORT_REFS)
280 strbuf_addstr(sb, prettify_refname(decoration->name));
281 else
282 strbuf_addstr(sb, decoration->name);
283}
284
Junio C Hamano51ff0f22015-03-10 14:53:21 +0100285/*
Harry Jeffery92710952014-09-18 21:53:53 +0100286 * The caller makes sure there is no funny color before calling.
287 * format_decorations_extended makes sure the same after return.
Nguyễn Thái Ngọc Duy9d3f0022013-04-19 09:08:43 +1000288 */
Harry Jeffery92710952014-09-18 21:53:53 +0100289void format_decorations_extended(struct strbuf *sb,
Nguyễn Thái Ngọc Duy9d3f0022013-04-19 09:08:43 +1000290 const struct commit *commit,
Harry Jeffery92710952014-09-18 21:53:53 +0100291 int use_color,
292 const char *prefix,
293 const char *separator,
294 const char *suffix)
Linus Torvaldsca135e72007-04-16 16:05:10 -0700295{
Jeff King2608c242014-08-26 06:23:54 -0400296 const struct name_decoration *decoration;
Junio C Hamano51ff0f22015-03-10 14:53:21 +0100297 const struct name_decoration *current_and_HEAD;
Nazri Ramliy67a4b582010-06-19 09:37:35 +0800298 const char *color_commit =
Nguyễn Thái Ngọc Duy9d3f0022013-04-19 09:08:43 +1000299 diff_get_color(use_color, DIFF_COMMIT);
Nazri Ramliy67a4b582010-06-19 09:37:35 +0800300 const char *color_reset =
Nguyễn Thái Ngọc Duy9d3f0022013-04-19 09:08:43 +1000301 decorate_get_color(use_color, DECORATION_NONE);
Linus Torvaldsca135e72007-04-16 16:05:10 -0700302
Jeff King2608c242014-08-26 06:23:54 -0400303 decoration = get_name_decoration(&commit->object);
Linus Torvaldsca135e72007-04-16 16:05:10 -0700304 if (!decoration)
305 return;
Junio C Hamano51ff0f22015-03-10 14:53:21 +0100306
307 current_and_HEAD = current_pointed_by_HEAD(decoration);
Linus Torvaldsca135e72007-04-16 16:05:10 -0700308 while (decoration) {
Junio C Hamano51ff0f22015-03-10 14:53:21 +0100309 /*
310 * When both current and HEAD are there, only
311 * show HEAD->current where HEAD would have
312 * appeared, skipping the entry for current.
313 */
314 if (decoration != current_and_HEAD) {
315 strbuf_addstr(sb, color_commit);
316 strbuf_addstr(sb, prefix);
317 strbuf_addstr(sb, color_reset);
318 strbuf_addstr(sb, decorate_get_color(use_color, decoration->type));
319 if (decoration->type == DECORATION_REF_TAG)
320 strbuf_addstr(sb, "tag: ");
321
Junio C Hamano429ad202015-05-13 12:40:35 -0700322 show_name(sb, decoration);
Junio C Hamano51ff0f22015-03-10 14:53:21 +0100323
324 if (current_and_HEAD &&
325 decoration->type == DECORATION_REF_HEAD) {
Junio C Hamano51ff0f22015-03-10 14:53:21 +0100326 strbuf_addstr(sb, " -> ");
327 strbuf_addstr(sb, color_reset);
328 strbuf_addstr(sb, decorate_get_color(use_color, current_and_HEAD->type));
Junio C Hamano429ad202015-05-13 12:40:35 -0700329 show_name(sb, current_and_HEAD);
Junio C Hamano51ff0f22015-03-10 14:53:21 +0100330 }
331 strbuf_addstr(sb, color_reset);
332
333 prefix = separator;
334 }
Linus Torvaldsca135e72007-04-16 16:05:10 -0700335 decoration = decoration->next;
336 }
Nguyễn Thái Ngọc Duy9d3f0022013-04-19 09:08:43 +1000337 strbuf_addstr(sb, color_commit);
Harry Jeffery92710952014-09-18 21:53:53 +0100338 strbuf_addstr(sb, suffix);
Nguyễn Thái Ngọc Duy9d3f0022013-04-19 09:08:43 +1000339 strbuf_addstr(sb, color_reset);
340}
341
342void show_decorations(struct rev_info *opt, struct commit *commit)
343{
344 struct strbuf sb = STRBUF_INIT;
345
Nguyễn Thái Ngọc Duy87be2522018-05-19 07:28:24 +0200346 if (opt->sources) {
347 char **slot = revision_sources_peek(opt->sources, commit);
348
349 if (slot && *slot)
350 fprintf(opt->diffopt.file, "\t%s", *slot);
351 }
Nguyễn Thái Ngọc Duy9d3f0022013-04-19 09:08:43 +1000352 if (!opt->show_decorations)
353 return;
354 format_decorations(&sb, commit, opt->diffopt.use_color);
Johannes Schindelin4d7b0ef2016-06-22 17:01:32 +0200355 fputs(sb.buf, opt->diffopt.file);
Nguyễn Thái Ngọc Duy9d3f0022013-04-19 09:08:43 +1000356 strbuf_release(&sb);
Linus Torvaldsca135e72007-04-16 16:05:10 -0700357}
358
Johannes Schindeline00de242007-02-09 01:43:54 +0100359static unsigned int digits_in_number(unsigned int number)
360{
361 unsigned int i = 10, result = 1;
362 while (i <= number) {
363 i *= 10;
364 result++;
365 }
366 return result;
367}
368
Junio C Hamanod28b5d42012-12-21 22:06:01 -0800369void fmt_output_subject(struct strbuf *filename,
370 const char *subject,
Junio C Hamano021f2f42012-12-21 23:26:16 -0800371 struct rev_info *info)
Stephen Boyd6fa8e622009-03-22 19:14:04 -0700372{
Junio C Hamano021f2f42012-12-21 23:26:16 -0800373 const char *suffix = info->patch_suffix;
374 int nr = info->nr;
Junio C Hamanod28b5d42012-12-21 22:06:01 -0800375 int start_len = filename->len;
Junio C Hamano3baf58b2020-11-06 13:56:24 -0800376 int max_len = start_len + info->patch_name_max - (strlen(suffix) + 1);
Stephen Boyd6fa8e622009-03-22 19:14:04 -0700377
ZheNing Hudb919882021-03-23 11:12:25 +0000378 if (info->reroll_count) {
379 struct strbuf temp = STRBUF_INIT;
380
381 strbuf_addf(&temp, "v%s", info->reroll_count);
382 format_sanitized_subject(filename, temp.buf, temp.len);
383 strbuf_addstr(filename, "-");
384 strbuf_release(&temp);
385 }
Junio C Hamanod28b5d42012-12-21 22:06:01 -0800386 strbuf_addf(filename, "%04d-%s", nr, subject);
Christian Couderb09b8682009-03-27 01:13:01 +0100387
Junio C Hamanod28b5d42012-12-21 22:06:01 -0800388 if (max_len < filename->len)
389 strbuf_setlen(filename, max_len);
390 strbuf_addstr(filename, suffix);
391}
Jeff Kinga21c2f92012-05-21 19:10:32 -0400392
Junio C Hamanod28b5d42012-12-21 22:06:01 -0800393void fmt_output_commit(struct strbuf *filename,
394 struct commit *commit,
395 struct rev_info *info)
396{
397 struct pretty_print_context ctx = {0};
398 struct strbuf subject = STRBUF_INIT;
399
400 format_commit_message(commit, "%f", &subject, &ctx);
401 fmt_output_subject(filename, subject.buf, info);
402 strbuf_release(&subject);
Stephen Boyd6fa8e622009-03-22 19:14:04 -0700403}
404
René Scharfe8ffc8dc2017-03-01 12:36:38 +0100405void fmt_output_email_subject(struct strbuf *sb, struct rev_info *opt)
406{
407 if (opt->total > 0) {
408 strbuf_addf(sb, "Subject: [%s%s%0*d/%d] ",
409 opt->subject_prefix,
410 *opt->subject_prefix ? " " : "",
411 digits_in_number(opt->total),
412 opt->nr, opt->total);
413 } else if (opt->total == 0 && opt->subject_prefix && *opt->subject_prefix) {
414 strbuf_addf(sb, "Subject: [%s] ",
415 opt->subject_prefix);
416 } else {
417 strbuf_addstr(sb, "Subject: ");
418 }
419}
420
Stephen Boyd108dab22009-03-22 19:14:05 -0700421void log_write_email_headers(struct rev_info *opt, struct commit *commit,
Junio C Hamano267123b2008-03-15 00:09:20 -0700422 const char **extra_headers_p,
brian m. carlson50cd54e2018-05-02 02:20:52 +0000423 int *need_8bit_cte_p,
424 int maybe_multipart)
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500425{
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500426 const char *extra_headers = opt->extra_headers;
brian m. carlson3a30aa12015-12-15 01:52:04 +0000427 const char *name = oid_to_hex(opt->zero_commit ?
brian m. carlson14228442021-04-26 01:02:56 +0000428 null_oid() : &commit->object.oid);
Junio C Hamano267123b2008-03-15 00:09:20 -0700429
430 *need_8bit_cte_p = 0; /* unknown */
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500431
Johannes Schindelin4d7b0ef2016-06-22 17:01:32 +0200432 fprintf(opt->diffopt.file, "From %s Mon Sep 17 00:00:00 2001\n", name);
Adam Simpkins7fefda52008-05-04 03:36:54 -0700433 graph_show_oneline(opt->graph);
434 if (opt->message_id) {
Johannes Schindelin4d7b0ef2016-06-22 17:01:32 +0200435 fprintf(opt->diffopt.file, "Message-Id: <%s>\n", opt->message_id);
Adam Simpkins7fefda52008-05-04 03:36:54 -0700436 graph_show_oneline(opt->graph);
437 }
Thomas Rastb079c502009-02-19 22:26:31 +0100438 if (opt->ref_message_ids && opt->ref_message_ids->nr > 0) {
439 int i, n;
440 n = opt->ref_message_ids->nr;
Johannes Schindelin4d7b0ef2016-06-22 17:01:32 +0200441 fprintf(opt->diffopt.file, "In-Reply-To: <%s>\n", opt->ref_message_ids->items[n-1].string);
Thomas Rastb079c502009-02-19 22:26:31 +0100442 for (i = 0; i < n; i++)
Johannes Schindelin4d7b0ef2016-06-22 17:01:32 +0200443 fprintf(opt->diffopt.file, "%s<%s>\n", (i > 0 ? "\t" : "References: "),
Thomas Rastb079c502009-02-19 22:26:31 +0100444 opt->ref_message_ids->items[i].string);
Adam Simpkins7fefda52008-05-04 03:36:54 -0700445 graph_show_oneline(opt->graph);
446 }
brian m. carlson50cd54e2018-05-02 02:20:52 +0000447 if (opt->mime_boundary && maybe_multipart) {
Jeff Kingd50b69b2018-05-18 18:57:44 -0700448 static struct strbuf subject_buffer = STRBUF_INIT;
449 static struct strbuf buffer = STRBUF_INIT;
Stephen Boyd108dab22009-03-22 19:14:05 -0700450 struct strbuf filename = STRBUF_INIT;
Junio C Hamano267123b2008-03-15 00:09:20 -0700451 *need_8bit_cte_p = -1; /* NEVER */
Jeff Kingd50b69b2018-05-18 18:57:44 -0700452
453 strbuf_reset(&subject_buffer);
454 strbuf_reset(&buffer);
455
456 strbuf_addf(&subject_buffer,
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500457 "%s"
458 "MIME-Version: 1.0\n"
459 "Content-Type: multipart/mixed;"
460 " boundary=\"%s%s\"\n"
461 "\n"
462 "This is a multi-part message in MIME "
463 "format.\n"
464 "--%s%s\n"
465 "Content-Type: text/plain; "
466 "charset=UTF-8; format=fixed\n"
467 "Content-Transfer-Encoding: 8bit\n\n",
468 extra_headers ? extra_headers : "",
469 mime_boundary_leader, opt->mime_boundary,
470 mime_boundary_leader, opt->mime_boundary);
Jeff Kingd50b69b2018-05-18 18:57:44 -0700471 extra_headers = subject_buffer.buf;
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500472
Junio C Hamano38ec23a2012-12-21 21:39:37 -0800473 if (opt->numbered_files)
474 strbuf_addf(&filename, "%d", opt->nr);
475 else
Junio C Hamanod28b5d42012-12-21 22:06:01 -0800476 fmt_output_commit(&filename, commit, opt);
Jeff Kingd50b69b2018-05-18 18:57:44 -0700477 strbuf_addf(&buffer,
Kevin Ballard6b2fbaa2008-07-29 22:49:33 -0700478 "\n--%s%s\n"
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500479 "Content-Type: text/x-patch;"
Stephen Boyd108dab22009-03-22 19:14:05 -0700480 " name=\"%s\"\n"
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500481 "Content-Transfer-Encoding: 8bit\n"
482 "Content-Disposition: %s;"
Stephen Boyd108dab22009-03-22 19:14:05 -0700483 " filename=\"%s\"\n\n",
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500484 mime_boundary_leader, opt->mime_boundary,
Stephen Boyd108dab22009-03-22 19:14:05 -0700485 filename.buf,
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500486 opt->no_inline ? "attachment" : "inline",
Stephen Boyd108dab22009-03-22 19:14:05 -0700487 filename.buf);
Jeff Kingd50b69b2018-05-18 18:57:44 -0700488 opt->diffopt.stat_sep = buffer.buf;
Stephen Boyd108dab22009-03-22 19:14:05 -0700489 strbuf_release(&filename);
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500490 }
Daniel Barkalowb02bd652008-02-18 22:56:08 -0500491 *extra_headers_p = extra_headers;
492}
493
Junio C Hamanoc6b3ec42012-01-04 13:48:45 -0800494static void show_sig_lines(struct rev_info *opt, int status, const char *bol)
495{
496 const char *color, *reset, *eol;
497
498 color = diff_get_color_opt(&opt->diffopt,
499 status ? DIFF_WHITESPACE : DIFF_FRAGINFO);
500 reset = diff_get_color_opt(&opt->diffopt, DIFF_RESET);
501 while (*bol) {
502 eol = strchrnul(bol, '\n');
Johannes Schindelin4d7b0ef2016-06-22 17:01:32 +0200503 fprintf(opt->diffopt.file, "%s%.*s%s%s", color, (int)(eol - bol), bol, reset,
Junio C Hamanoc6b3ec42012-01-04 13:48:45 -0800504 *eol ? "\n" : "");
Zoltan Klingercf3983d2014-07-09 12:10:21 +1000505 graph_show_oneline(opt->graph);
Junio C Hamanoc6b3ec42012-01-04 13:48:45 -0800506 bol = (*eol) ? (eol + 1) : eol;
507 }
508}
509
Junio C Hamano0c37f1f2011-10-18 15:53:23 -0700510static void show_signature(struct rev_info *opt, struct commit *commit)
511{
512 struct strbuf payload = STRBUF_INIT;
513 struct strbuf signature = STRBUF_INIT;
Hans Jerry Illikainen67948982020-03-04 11:48:04 +0000514 struct signature_check sigc = { 0 };
Junio C Hamano0c37f1f2011-10-18 15:53:23 -0700515 int status;
Junio C Hamano0c37f1f2011-10-18 15:53:23 -0700516
brian m. carlson1fb5cf02021-01-18 23:49:11 +0000517 if (parse_signed_commit(commit, &payload, &signature, the_hash_algo) <= 0)
Junio C Hamano0c37f1f2011-10-18 15:53:23 -0700518 goto out;
519
Fabian Stelzer4bbf3782021-12-09 09:52:46 +0100520 sigc.payload_type = SIGNATURE_PAYLOAD_COMMIT;
Fabian Stelzer02769432021-12-09 09:52:43 +0100521 sigc.payload = strbuf_detach(&payload, &sigc.payload_len);
522 status = check_signature(&sigc, signature.buf, signature.len);
Fabian Stelzerb5726a52021-09-10 20:07:34 +0000523 if (status && !sigc.output)
Hans Jerry Illikainen67948982020-03-04 11:48:04 +0000524 show_sig_lines(opt, status, "No signature\n");
525 else
Fabian Stelzerb5726a52021-09-10 20:07:34 +0000526 show_sig_lines(opt, status, sigc.output);
Hans Jerry Illikainen67948982020-03-04 11:48:04 +0000527 signature_check_clear(&sigc);
Junio C Hamano0c37f1f2011-10-18 15:53:23 -0700528
529 out:
Junio C Hamano0c37f1f2011-10-18 15:53:23 -0700530 strbuf_release(&payload);
531 strbuf_release(&signature);
532}
533
brian m. carlsona92ea682017-05-06 22:10:18 +0000534static int which_parent(const struct object_id *oid, const struct commit *commit)
Junio C Hamano824958e2012-01-04 13:51:28 -0800535{
536 int nth;
537 const struct commit_list *parent;
538
539 for (nth = 0, parent = commit->parents; parent; parent = parent->next) {
Jeff King4a7e27e2018-08-28 17:22:40 -0400540 if (oideq(&parent->item->object.oid, oid))
Junio C Hamano824958e2012-01-04 13:51:28 -0800541 return nth;
542 nth++;
543 }
544 return -1;
545}
546
Junio C Hamanod041ffa2012-01-04 16:23:12 -0800547static int is_common_merge(const struct commit *commit)
548{
549 return (commit->parents
550 && commit->parents->next
551 && !commit->parents->next->next);
552}
553
Johannes Schindelinfef461e2018-04-25 11:54:04 +0200554static int show_one_mergetag(struct commit *commit,
555 struct commit_extra_header *extra,
556 void *data)
Junio C Hamano824958e2012-01-04 13:51:28 -0800557{
Christian Couder063da622014-07-07 08:35:37 +0200558 struct rev_info *opt = (struct rev_info *)data;
brian m. carlsona92ea682017-05-06 22:10:18 +0000559 struct object_id oid;
Junio C Hamano824958e2012-01-04 13:51:28 -0800560 struct tag *tag;
561 struct strbuf verify_message;
Hans Jerry Illikainen67948982020-03-04 11:48:04 +0000562 struct signature_check sigc = { 0 };
Junio C Hamano824958e2012-01-04 13:51:28 -0800563 int status, nth;
brian m. carlson482c1192021-02-11 02:08:03 +0000564 struct strbuf payload = STRBUF_INIT;
565 struct strbuf signature = STRBUF_INIT;
Junio C Hamano824958e2012-01-04 13:51:28 -0800566
Matheus Tavares2dcde202020-01-30 17:32:22 -0300567 hash_object_file(the_hash_algo, extra->value, extra->len,
568 type_name(OBJ_TAG), &oid);
Stefan Bellerce71efb2018-06-28 18:22:03 -0700569 tag = lookup_tag(the_repository, &oid);
Junio C Hamano824958e2012-01-04 13:51:28 -0800570 if (!tag)
Johannes Schindelinfef461e2018-04-25 11:54:04 +0200571 return -1; /* error message already given */
Junio C Hamano824958e2012-01-04 13:51:28 -0800572
573 strbuf_init(&verify_message, 256);
Stefan Beller0e740fe2018-06-28 18:22:04 -0700574 if (parse_tag_buffer(the_repository, tag, extra->value, extra->len))
Junio C Hamano824958e2012-01-04 13:51:28 -0800575 strbuf_addstr(&verify_message, "malformed mergetag\n");
Junio C Hamanod041ffa2012-01-04 16:23:12 -0800576 else if (is_common_merge(commit) &&
Jeff King4a7e27e2018-08-28 17:22:40 -0400577 oideq(&tag->tagged->oid,
578 &commit->parents->next->item->object.oid))
Junio C Hamanod041ffa2012-01-04 16:23:12 -0800579 strbuf_addf(&verify_message,
580 "merged tag '%s'\n", tag->tag);
brian m. carlsona92ea682017-05-06 22:10:18 +0000581 else if ((nth = which_parent(&tag->tagged->oid, commit)) < 0)
Junio C Hamano824958e2012-01-04 13:51:28 -0800582 strbuf_addf(&verify_message, "tag %s names a non-parent %s\n",
Harald van Dijk237a2812020-02-29 13:07:57 +0000583 tag->tag, oid_to_hex(&tag->tagged->oid));
Junio C Hamano824958e2012-01-04 13:51:28 -0800584 else
585 strbuf_addf(&verify_message,
586 "parent #%d, tagged '%s'\n", nth + 1, tag->tag);
Junio C Hamano824958e2012-01-04 13:51:28 -0800587
Michael J Gruber13150932013-02-14 17:04:43 +0100588 status = -1;
brian m. carlson482c1192021-02-11 02:08:03 +0000589 if (parse_signature(extra->value, extra->len, &payload, &signature)) {
Michael J Gruber42c55ce2014-06-27 15:18:36 +0200590 /* could have a good signature */
Fabian Stelzer4bbf3782021-12-09 09:52:46 +0100591 sigc.payload_type = SIGNATURE_PAYLOAD_TAG;
Fabian Stelzer02769432021-12-09 09:52:43 +0100592 sigc.payload = strbuf_detach(&payload, &sigc.payload_len);
593 status = check_signature(&sigc, signature.buf, signature.len);
Fabian Stelzerb5726a52021-09-10 20:07:34 +0000594 if (sigc.output)
595 strbuf_addstr(&verify_message, sigc.output);
Hans Jerry Illikainen67948982020-03-04 11:48:04 +0000596 else
Michael J Gruber42c55ce2014-06-27 15:18:36 +0200597 strbuf_addstr(&verify_message, "No signature\n");
Hans Jerry Illikainen67948982020-03-04 11:48:04 +0000598 signature_check_clear(&sigc);
Michael J Gruber42c55ce2014-06-27 15:18:36 +0200599 /* otherwise we couldn't verify, which is shown as bad */
600 }
Junio C Hamano824958e2012-01-04 13:51:28 -0800601
602 show_sig_lines(opt, status, verify_message.buf);
603 strbuf_release(&verify_message);
brian m. carlson482c1192021-02-11 02:08:03 +0000604 strbuf_release(&payload);
605 strbuf_release(&signature);
Johannes Schindelinfef461e2018-04-25 11:54:04 +0200606 return 0;
Junio C Hamano824958e2012-01-04 13:51:28 -0800607}
608
Johannes Schindelinfef461e2018-04-25 11:54:04 +0200609static int show_mergetag(struct rev_info *opt, struct commit *commit)
Junio C Hamano824958e2012-01-04 13:51:28 -0800610{
Johannes Schindelinfef461e2018-04-25 11:54:04 +0200611 return for_each_mergetag(show_one_mergetag, commit, opt);
Junio C Hamano824958e2012-01-04 13:51:28 -0800612}
613
Eric Sunshine3fcc7a22018-07-22 05:57:08 -0400614static void next_commentary_block(struct rev_info *opt, struct strbuf *sb)
615{
616 const char *x = opt->shown_dashes ? "\n" : "---\n";
617 if (sb)
618 strbuf_addstr(sb, x);
619 else
620 fputs(x, opt->diffopt.file);
621 opt->shown_dashes = 1;
622}
623
Adam Simpkins02865652008-04-29 01:32:59 -0700624void show_log(struct rev_info *opt)
Linus Torvalds91539832006-04-17 11:59:32 -0700625{
Brandon Caseyf285a2d2008-10-09 14:12:12 -0500626 struct strbuf msgbuf = STRBUF_INIT;
Timo Hirvonen39bc9a62006-06-25 13:54:14 +0300627 struct log_info *log = opt->loginfo;
Linus Torvalds91539832006-04-17 11:59:32 -0700628 struct commit *commit = log->commit, *parent = log->parent;
brian m. carlson2ed19602018-07-16 01:28:06 +0000629 int abbrev_commit = opt->abbrev_commit ? opt->abbrev : the_hash_algo->hexsz;
Thomas Rastdd2e7942009-10-19 17:48:08 +0200630 const char *extra_headers = opt->extra_headers;
631 struct pretty_print_context ctx = {0};
Linus Torvalds91539832006-04-17 11:59:32 -0700632
633 opt->loginfo = NULL;
634 if (!opt->verbose_header) {
Adam Simpkins7fefda52008-05-04 03:36:54 -0700635 graph_show_commit(opt->graph);
636
Michael J Gruber1df2d652011-03-07 13:31:39 +0100637 if (!opt->graph)
Michael J Gruberb1b47552011-03-10 15:45:03 +0100638 put_revision_mark(opt, commit);
brian m. carlsonaab95832018-03-12 02:27:30 +0000639 fputs(find_unique_abbrev(&commit->object.oid, abbrev_commit), opt->diffopt.file);
Adam Simpkins885cf802008-05-04 03:36:52 -0700640 if (opt->print_parents)
Johannes Schindelin4d7b0ef2016-06-22 17:01:32 +0200641 show_parents(commit, abbrev_commit, opt->diffopt.file);
Jay Soffian91b849b2011-10-04 10:02:03 -0400642 if (opt->children.name)
643 show_children(opt, commit, abbrev_commit);
Linus Torvalds0f3a2902008-10-27 12:51:59 -0700644 show_decorations(opt, commit);
Adam Simpkins7fefda52008-05-04 03:36:54 -0700645 if (opt->graph && !graph_is_commit_finished(opt->graph)) {
Johannes Schindelin4d7b0ef2016-06-22 17:01:32 +0200646 putc('\n', opt->diffopt.file);
Adam Simpkins7fefda52008-05-04 03:36:54 -0700647 graph_show_remainder(opt->graph);
648 }
Johannes Schindelin4d7b0ef2016-06-22 17:01:32 +0200649 putc(opt->diffopt.line_termination, opt->diffopt.file);
Linus Torvalds91539832006-04-17 11:59:32 -0700650 return;
651 }
652
653 /*
Jeff King87152272009-07-01 03:26:28 -0400654 * If use_terminator is set, we already handled any record termination
655 * at the end of the last record.
Adam Simpkins02865652008-04-29 01:32:59 -0700656 * Otherwise, add a diffopt.line_termination character before all
657 * entries but the first. (IOW, as a separator between entries)
Linus Torvalds91539832006-04-17 11:59:32 -0700658 */
Adam Simpkins7fefda52008-05-04 03:36:54 -0700659 if (opt->shown_one && !opt->use_terminator) {
660 /*
661 * If entries are separated by a newline, the output
662 * should look human-readable. If the last entry ended
663 * with a newline, print the graph output before this
664 * newline. Otherwise it will end up as a completely blank
665 * line and will look like a gap in the graph.
666 *
667 * If the entry separator is not a newline, the output is
668 * primarily intended for programmatic consumption, and we
669 * never want the extra graph output before the entry
670 * separator.
671 */
672 if (opt->diffopt.line_termination == '\n' &&
673 !opt->missing_newline)
674 graph_show_padding(opt->graph);
Johannes Schindelin4d7b0ef2016-06-22 17:01:32 +0200675 putc(opt->diffopt.line_termination, opt->diffopt.file);
Adam Simpkins7fefda52008-05-04 03:36:54 -0700676 }
Linus Torvalds91539832006-04-17 11:59:32 -0700677 opt->shown_one = 1;
678
679 /*
Adam Simpkins7fefda52008-05-04 03:36:54 -0700680 * If the history graph was requested,
681 * print the graph, up to this commit's line
682 */
683 graph_show_commit(opt->graph);
684
685 /*
Linus Torvalds91539832006-04-17 11:59:32 -0700686 * Print header line of header..
687 */
Junio C Hamano3eefc182006-04-18 16:45:27 -0700688
Eric Wong9f23e042016-06-05 04:46:39 +0000689 if (cmit_fmt_is_mail(opt->commit_format)) {
René Scharfe6d167fd2017-03-01 12:37:07 +0100690 log_write_email_headers(opt, commit, &extra_headers,
brian m. carlson50cd54e2018-05-02 02:20:52 +0000691 &ctx.need_8bit_cte, 1);
René Scharfe6d167fd2017-03-01 12:37:07 +0100692 ctx.rev = opt;
693 ctx.print_email_subject = 1;
Johannes Schindeline52a5de2007-02-23 01:35:03 +0100694 } else if (opt->commit_format != CMIT_FMT_USERFORMAT) {
Johannes Schindelin4d7b0ef2016-06-22 17:01:32 +0200695 fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), opt->diffopt.file);
Junio C Hamano74bd9022006-12-16 15:31:25 -0800696 if (opt->commit_format != CMIT_FMT_ONELINE)
Johannes Schindelin4d7b0ef2016-06-22 17:01:32 +0200697 fputs("commit ", opt->diffopt.file);
Adam Simpkins7528f272008-05-25 00:07:21 -0700698
Michael J Gruber1df2d652011-03-07 13:31:39 +0100699 if (!opt->graph)
Michael J Gruberb1b47552011-03-10 15:45:03 +0100700 put_revision_mark(opt, commit);
brian m. carlsonaab95832018-03-12 02:27:30 +0000701 fputs(find_unique_abbrev(&commit->object.oid,
702 abbrev_commit),
Johannes Schindelin4d7b0ef2016-06-22 17:01:32 +0200703 opt->diffopt.file);
Adam Simpkins885cf802008-05-04 03:36:52 -0700704 if (opt->print_parents)
Johannes Schindelin4d7b0ef2016-06-22 17:01:32 +0200705 show_parents(commit, abbrev_commit, opt->diffopt.file);
Jay Soffian91b849b2011-10-04 10:02:03 -0400706 if (opt->children.name)
707 show_children(opt, commit, abbrev_commit);
Junio C Hamano73f0a152006-05-24 12:19:47 -0700708 if (parent)
Johannes Schindelin4d7b0ef2016-06-22 17:01:32 +0200709 fprintf(opt->diffopt.file, " (from %s)",
brian m. carlsonaab95832018-03-12 02:27:30 +0000710 find_unique_abbrev(&parent->object.oid, abbrev_commit));
Johannes Schindelin4d7b0ef2016-06-22 17:01:32 +0200711 fputs(diff_get_color_opt(&opt->diffopt, DIFF_RESET), opt->diffopt.file);
Linus Torvalds0f3a2902008-10-27 12:51:59 -0700712 show_decorations(opt, commit);
Adam Simpkins7fefda52008-05-04 03:36:54 -0700713 if (opt->commit_format == CMIT_FMT_ONELINE) {
Johannes Schindelin4d7b0ef2016-06-22 17:01:32 +0200714 putc(' ', opt->diffopt.file);
Adam Simpkins7fefda52008-05-04 03:36:54 -0700715 } else {
Johannes Schindelin4d7b0ef2016-06-22 17:01:32 +0200716 putc('\n', opt->diffopt.file);
Adam Simpkins7fefda52008-05-04 03:36:54 -0700717 graph_show_oneline(opt->graph);
718 }
Nicolas Pitre903b45f2007-01-27 22:40:36 -0500719 if (opt->reflog_info) {
Adam Simpkins7fefda52008-05-04 03:36:54 -0700720 /*
721 * setup_revisions() ensures that opt->reflog_info
722 * and opt->graph cannot both be set,
723 * so we don't need to worry about printing the
724 * graph info here.
725 */
Junio C Hamano4d12a472007-01-20 00:51:41 -0800726 show_reflog_message(opt->reflog_info,
Junio C Hamano55ccf852012-05-07 14:11:32 -0700727 opt->commit_format == CMIT_FMT_ONELINE,
Jeff Kinga5481a62015-06-25 12:55:02 -0400728 &opt->date_mode,
Junio C Hamano55ccf852012-05-07 14:11:32 -0700729 opt->date_mode_explicit);
Adam Simpkins02865652008-04-29 01:32:59 -0700730 if (opt->commit_format == CMIT_FMT_ONELINE)
Nicolas Pitre903b45f2007-01-27 22:40:36 -0500731 return;
Nicolas Pitre903b45f2007-01-27 22:40:36 -0500732 }
Junio C Hamano3eefc182006-04-18 16:45:27 -0700733 }
Linus Torvalds91539832006-04-17 11:59:32 -0700734
Junio C Hamano824958e2012-01-04 13:51:28 -0800735 if (opt->show_signature) {
Junio C Hamano0c37f1f2011-10-18 15:53:23 -0700736 show_signature(opt, commit);
Junio C Hamano824958e2012-01-04 13:51:28 -0800737 show_mergetag(opt, commit);
738 }
Junio C Hamano0c37f1f2011-10-18 15:53:23 -0700739
Junio C Hamanoddf333f2012-10-17 18:51:47 -0700740 if (opt->show_notes) {
741 int raw;
742 struct strbuf notebuf = STRBUF_INIT;
743
744 raw = (opt->commit_format == CMIT_FMT_USERFORMAT);
brian m. carlsonfb61e4d2017-05-30 10:30:41 -0700745 format_display_notes(&commit->object.oid, &notebuf,
Junio C Hamanoddf333f2012-10-17 18:51:47 -0700746 get_log_output_encoding(), raw);
René Scharfe82f51af2019-08-25 14:53:26 +0200747 ctx.notes_message = strbuf_detach(&notebuf, NULL);
Junio C Hamanoddf333f2012-10-17 18:51:47 -0700748 }
749
Linus Torvalds91539832006-04-17 11:59:32 -0700750 /*
751 * And then the pretty-printed message itself
752 */
Nguyễn Thái Ngọc Duy5289c562013-02-12 02:17:38 -0800753 if (ctx.need_8bit_cte >= 0 && opt->add_signoff)
754 ctx.need_8bit_cte =
William Hubbs39ab4d02019-02-04 12:48:50 -0600755 has_non_ascii(fmt_name(WANT_COMMITTER_IDENT));
Thomas Rastdd2e7942009-10-19 17:48:08 +0200756 ctx.date_mode = opt->date_mode;
Jeff Kingf026c752012-05-04 01:25:18 -0400757 ctx.date_mode_explicit = opt->date_mode_explicit;
Thomas Rastdd2e7942009-10-19 17:48:08 +0200758 ctx.abbrev = opt->diffopt.abbrev;
759 ctx.after_subject = extra_headers;
Jeff King9553d2b2011-05-26 18:28:17 -0400760 ctx.preserve_subject = opt->preserve_subject;
Emma Brooks19d097e2020-04-08 04:31:38 +0000761 ctx.encode_email_headers = opt->encode_email_headers;
Thomas Rast8f8f5472009-10-19 17:48:10 +0200762 ctx.reflog_info = opt->reflog_info;
Jeff King6bf13942011-05-26 18:27:49 -0400763 ctx.fmt = opt->commit_format;
Antoine Pelisse0e2913b2013-01-05 22:26:41 +0100764 ctx.mailmap = opt->mailmap;
Junio C Hamano30825172012-12-17 17:56:49 -0500765 ctx.color = opt->diffopt.use_color;
Linus Torvalds7cc13c72016-03-16 09:15:53 -0700766 ctx.expand_tabs_in_log = opt->expand_tabs_in_log;
Alexey Shumkinecaee802013-06-26 14:19:50 +0400767 ctx.output_encoding = get_log_output_encoding();
Issac Trottsad6f0282019-01-10 22:30:46 -0800768 ctx.rev = opt;
Jeff Kinga9080472013-07-03 03:08:22 -0400769 if (opt->from_ident.mail_begin && opt->from_ident.name_begin)
770 ctx.from_ident = &opt->from_ident;
Josef Kufner3ad87c82016-06-16 20:18:37 +0700771 if (opt->graph)
772 ctx.graph_width = graph_width(opt->graph);
Jeff King6bf13942011-05-26 18:27:49 -0400773 pretty_print_commit(&ctx, commit, &msgbuf);
Junio C Hamano212620f2012-10-17 20:48:25 -0700774
775 if (opt->add_signoff)
Nguyễn Thái Ngọc Duy5289c562013-02-12 02:17:38 -0800776 append_signoff(&msgbuf, 0, APPEND_SIGNOFF_DEDUP);
Junio C Hamano212620f2012-10-17 20:48:25 -0700777
Junio C Hamano5a664cf2012-10-17 19:02:46 -0700778 if ((ctx.fmt != CMIT_FMT_USERFORMAT) &&
Junio C Hamanobd1470b2012-10-17 21:27:22 -0700779 ctx.notes_message && *ctx.notes_message) {
Eric Sunshine3fcc7a22018-07-22 05:57:08 -0400780 if (cmit_fmt_is_mail(ctx.fmt))
781 next_commentary_block(opt, &msgbuf);
Junio C Hamano5a664cf2012-10-17 19:02:46 -0700782 strbuf_addstr(&msgbuf, ctx.notes_message);
Junio C Hamanobd1470b2012-10-17 21:27:22 -0700783 }
Junio C Hamanocf2251b2006-05-31 15:11:49 -0700784
Adam Simpkins7fefda52008-05-04 03:36:54 -0700785 if (opt->show_log_size) {
Johannes Schindelin4d7b0ef2016-06-22 17:01:32 +0200786 fprintf(opt->diffopt.file, "log size %i\n", (int)msgbuf.len);
Adam Simpkins7fefda52008-05-04 03:36:54 -0700787 graph_show_oneline(opt->graph);
788 }
Marco Costalba9fa34652007-07-20 20:15:13 +0200789
Adam Simpkins7fefda52008-05-04 03:36:54 -0700790 /*
791 * Set opt->missing_newline if msgbuf doesn't
792 * end in a newline (including if it is empty)
793 */
794 if (!msgbuf.len || msgbuf.buf[msgbuf.len - 1] != '\n')
795 opt->missing_newline = 1;
796 else
797 opt->missing_newline = 0;
798
Jacob Keller660e1132016-08-31 16:27:20 -0700799 graph_show_commit_msg(opt->graph, opt->diffopt.file, &msgbuf);
Jeff Kingb9c7d6e2014-07-29 13:56:48 -0400800 if (opt->use_terminator && !commit_format_is_empty(opt->commit_format)) {
Adam Simpkins7fefda52008-05-04 03:36:54 -0700801 if (!opt->missing_newline)
802 graph_show_padding(opt->graph);
Johannes Schindelin4d7b0ef2016-06-22 17:01:32 +0200803 putc(opt->diffopt.line_termination, opt->diffopt.file);
Adam Simpkins7fefda52008-05-04 03:36:54 -0700804 }
805
Pierre Habouzit674d1722007-09-10 12:35:06 +0200806 strbuf_release(&msgbuf);
Junio C Hamanoddf333f2012-10-17 18:51:47 -0700807 free(ctx.notes_message);
Eric Sunshineee6cbf72018-07-22 05:57:09 -0400808
809 if (cmit_fmt_is_mail(ctx.fmt) && opt->idiff_oid1) {
810 struct diff_queue_struct dq;
811
812 memcpy(&dq, &diff_queued_diff, sizeof(diff_queued_diff));
813 DIFF_QUEUE_CLEAR(&diff_queued_diff);
814
815 next_commentary_block(opt, NULL);
816 fprintf_ln(opt->diffopt.file, "%s", opt->idiff_title);
Eric Sunshine72a72392020-09-08 03:16:09 -0400817 show_interdiff(opt->idiff_oid1, opt->idiff_oid2, 2,
818 &opt->diffopt);
Eric Sunshineee6cbf72018-07-22 05:57:09 -0400819
820 memcpy(&diff_queued_diff, &dq, sizeof(diff_queued_diff));
821 }
Eric Sunshine40ce4162018-07-22 05:57:17 -0400822
823 if (cmit_fmt_is_mail(ctx.fmt) && opt->rdiff1) {
824 struct diff_queue_struct dq;
Martin Ågrenac0edf12018-12-03 16:21:31 -0500825 struct diff_options opts;
Johannes Schindelinf1ce6c12021-02-05 14:46:11 +0000826 struct range_diff_options range_diff_opts = {
827 .creation_factor = opt->creation_factor,
828 .dual_color = 1,
829 .diffopt = &opts
830 };
Eric Sunshine40ce4162018-07-22 05:57:17 -0400831
832 memcpy(&dq, &diff_queued_diff, sizeof(diff_queued_diff));
833 DIFF_QUEUE_CLEAR(&diff_queued_diff);
834
835 next_commentary_block(opt, NULL);
836 fprintf_ln(opt->diffopt.file, "%s", opt->rdiff_title);
Martin Ågrenac0edf12018-12-03 16:21:31 -0500837 /*
838 * Pass minimum required diff-options to range-diff; others
839 * can be added later if deemed desirable.
840 */
841 diff_setup(&opts);
842 opts.file = opt->diffopt.file;
843 opts.use_color = opt->diffopt.use_color;
844 diff_setup_done(&opts);
Johannes Schindelinf1ce6c12021-02-05 14:46:11 +0000845 show_range_diff(opt->rdiff1, opt->rdiff2, &range_diff_opts);
Eric Sunshine40ce4162018-07-22 05:57:17 -0400846
847 memcpy(&diff_queued_diff, &dq, sizeof(diff_queued_diff));
848 }
Linus Torvalds91539832006-04-17 11:59:32 -0700849}
850
Linus Torvaldscd2bdc52006-04-14 16:52:13 -0700851int log_tree_diff_flush(struct rev_info *opt)
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700852{
Junio C Hamanobd1470b2012-10-17 21:27:22 -0700853 opt->shown_dashes = 0;
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700854 diffcore_std(&opt->diffopt);
Linus Torvalds91539832006-04-17 11:59:32 -0700855
Elijah Newren95433ee2022-02-02 02:37:34 +0000856 if (diff_queue_is_empty(&opt->diffopt)) {
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700857 int saved_fmt = opt->diffopt.output_format;
858 opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
859 diff_flush(&opt->diffopt);
860 opt->diffopt.output_format = saved_fmt;
861 return 0;
862 }
Linus Torvalds91539832006-04-17 11:59:32 -0700863
Junio C Hamano3969cf72006-06-27 15:08:19 -0700864 if (opt->loginfo && !opt->no_commit_id) {
Adam Simpkins02865652008-04-29 01:32:59 -0700865 show_log(opt);
Linus Torvalds304b5af2007-10-09 09:35:22 -0700866 if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) &&
867 opt->verbose_header &&
Jeff Kingb9c7d6e2014-07-29 13:56:48 -0400868 opt->commit_format != CMIT_FMT_ONELINE &&
869 !commit_format_is_empty(opt->commit_format)) {
Junio C Hamano1d34c502012-11-13 10:09:07 -0800870 /*
871 * When showing a verbose header (i.e. log message),
872 * and not in --pretty=oneline format, we would want
873 * an extra newline between the end of log and the
874 * diff/diffstat output for readability.
875 */
Junio C Hamano3969cf72006-06-27 15:08:19 -0700876 int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
Bo Yang81bd1b22010-05-26 15:08:03 +0800877 if (opt->diffopt.output_prefix) {
878 struct strbuf *msg = NULL;
879 msg = opt->diffopt.output_prefix(&opt->diffopt,
880 opt->diffopt.output_prefix_data);
Johannes Schindelin4d7b0ef2016-06-22 17:01:32 +0200881 fwrite(msg->buf, msg->len, 1, opt->diffopt.file);
Bo Yang81bd1b22010-05-26 15:08:03 +0800882 }
Junio C Hamano1d34c502012-11-13 10:09:07 -0800883
884 /*
885 * We may have shown three-dashes line early
Eric Sunshine3fcc7a22018-07-22 05:57:08 -0400886 * between generated commentary (notes, etc.)
887 * and the log message, in which case we only
888 * want a blank line after the commentary
889 * without (an extra) three-dashes line.
Junio C Hamano1d34c502012-11-13 10:09:07 -0800890 * Otherwise, we show the three-dashes line if
891 * we are showing the patch with diffstat, but
892 * in that case, there is no extra blank line
893 * after the three-dashes line.
894 */
895 if (!opt->shown_dashes &&
896 (pch & opt->diffopt.output_format) == pch)
Johannes Schindelin4d7b0ef2016-06-22 17:01:32 +0200897 fprintf(opt->diffopt.file, "---");
898 putc('\n', opt->diffopt.file);
Junio C Hamano3969cf72006-06-27 15:08:19 -0700899 }
900 }
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700901 diff_flush(&opt->diffopt);
902 return 1;
903}
904
Linus Torvaldscd2bdc52006-04-14 16:52:13 -0700905static int do_diff_combined(struct rev_info *opt, struct commit *commit)
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700906{
Sergey Organovd01141d2020-09-29 14:31:22 +0300907 diff_tree_combined_merge(commit, opt);
Linus Torvalds91539832006-04-17 11:59:32 -0700908 return !opt->loginfo;
Junio C Hamano5f1c3f02006-04-09 01:11:11 -0700909}
910
Elijah Newren20323d12022-02-02 02:37:35 +0000911static void setup_additional_headers(struct diff_options *o,
912 struct strmap *all_headers)
913{
914 struct hashmap_iter iter;
915 struct strmap_entry *entry;
916
917 /*
918 * Make o->additional_path_headers contain the subset of all_headers
919 * that match o->pathspec. If there aren't any that match o->pathspec,
920 * then make o->additional_path_headers be NULL.
921 */
922
923 if (!o->pathspec.nr) {
924 o->additional_path_headers = all_headers;
925 return;
926 }
927
928 o->additional_path_headers = xmalloc(sizeof(struct strmap));
929 strmap_init_with_options(o->additional_path_headers, NULL, 0);
930 strmap_for_each_entry(all_headers, &iter, entry) {
931 if (match_pathspec(the_repository->index, &o->pathspec,
932 entry->key, strlen(entry->key),
933 0 /* prefix */, NULL /* seen */,
934 0 /* is_dir */))
935 strmap_put(o->additional_path_headers,
936 entry->key, entry->value);
937 }
938 if (!strmap_get_size(o->additional_path_headers)) {
939 strmap_clear(o->additional_path_headers, 0);
940 FREE_AND_NULL(o->additional_path_headers);
941 }
942}
943
944static void cleanup_additional_headers(struct diff_options *o)
945{
946 if (!o->pathspec.nr) {
947 o->additional_path_headers = NULL;
948 return;
949 }
950 if (!o->additional_path_headers)
951 return;
952
953 strmap_clear(o->additional_path_headers, 0);
954 FREE_AND_NULL(o->additional_path_headers);
955}
956
Elijah Newrendb757e82022-02-02 02:37:28 +0000957static int do_remerge_diff(struct rev_info *opt,
958 struct commit_list *parents,
959 struct object_id *oid,
960 struct commit *commit)
961{
962 struct merge_options o;
963 struct commit_list *bases;
964 struct merge_result res = {0};
965 struct pretty_print_context ctx = {0};
966 struct commit *parent1 = parents->item;
967 struct commit *parent2 = parents->next->item;
968 struct strbuf parent1_desc = STRBUF_INIT;
969 struct strbuf parent2_desc = STRBUF_INIT;
970
971 /* Setup merge options */
972 init_merge_options(&o, the_repository);
973 o.show_rename_progress = 0;
Elijah Newren20323d12022-02-02 02:37:35 +0000974 o.record_conflict_msgs_as_headers = 1;
975 o.msg_header_prefix = "remerge";
Elijah Newrendb757e82022-02-02 02:37:28 +0000976
977 ctx.abbrev = DEFAULT_ABBREV;
978 format_commit_message(parent1, "%h (%s)", &parent1_desc, &ctx);
979 format_commit_message(parent2, "%h (%s)", &parent2_desc, &ctx);
980 o.branch1 = parent1_desc.buf;
981 o.branch2 = parent2_desc.buf;
982
983 /* Parse the relevant commits and get the merge bases */
984 parse_commit_or_die(parent1);
985 parse_commit_or_die(parent2);
986 bases = get_merge_bases(parent1, parent2);
987
988 /* Re-merge the parents */
989 merge_incore_recursive(&o, bases, parent1, parent2, &res);
990
991 /* Show the diff */
Elijah Newren20323d12022-02-02 02:37:35 +0000992 setup_additional_headers(&opt->diffopt, res.path_messages);
Elijah Newrendb757e82022-02-02 02:37:28 +0000993 diff_tree_oid(&res.tree->object.oid, oid, "", &opt->diffopt);
994 log_tree_diff_flush(opt);
995
996 /* Cleanup */
Elijah Newren20323d12022-02-02 02:37:35 +0000997 cleanup_additional_headers(&opt->diffopt);
Elijah Newrendb757e82022-02-02 02:37:28 +0000998 strbuf_release(&parent1_desc);
999 strbuf_release(&parent2_desc);
1000 merge_finalize(&o, &res);
Elijah Newren7b90ab42022-02-02 02:37:29 +00001001
1002 /* Clean up the contents of the temporary object directory */
1003 if (opt->remerge_objdir)
1004 tmp_objdir_discard_objects(opt->remerge_objdir);
1005 else
1006 BUG("did a remerge diff without remerge_objdir?!?");
Elijah Newrendb757e82022-02-02 02:37:28 +00001007
1008 return !opt->loginfo;
1009}
1010
Linus Torvalds91539832006-04-17 11:59:32 -07001011/*
1012 * Show the diff of a commit.
1013 *
1014 * Return true if we printed any log info messages
1015 */
1016static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log_info *log)
Junio C Hamano5f1c3f02006-04-09 01:11:11 -07001017{
Linus Torvalds91539832006-04-17 11:59:32 -07001018 int showed_log;
Junio C Hamano5f1c3f02006-04-09 01:11:11 -07001019 struct commit_list *parents;
brian m. carlsonf2fd0762015-11-10 02:22:28 +00001020 struct object_id *oid;
Sergey Organova6d19ec2020-12-21 18:19:53 +03001021 int is_merge;
1022 int all_need_diff = opt->diff || opt->diffopt.flags.exit_with_status;
Junio C Hamano5f1c3f02006-04-09 01:11:11 -07001023
Sergey Organova6d19ec2020-12-21 18:19:53 +03001024 if (!all_need_diff && !opt->merges_need_diff)
Linus Torvalds91539832006-04-17 11:59:32 -07001025 return 0;
1026
Jeff King7059dcc2013-10-24 04:52:36 -04001027 parse_commit_or_die(commit);
Derrick Stolee2e27bd72018-04-06 19:09:38 +00001028 oid = get_commit_tree_oid(commit);
Thomas Rastd1b9b762013-03-28 09:19:34 +01001029
Thomas Rast53d00b32013-07-31 22:13:20 +02001030 parents = get_saved_parents(opt, commit);
Sergey Organova6d19ec2020-12-21 18:19:53 +03001031 is_merge = parents && parents->next;
1032 if (!is_merge && !all_need_diff)
1033 return 0;
1034
1035 /* Root commit? */
Linus Torvalds91539832006-04-17 11:59:32 -07001036 if (!parents) {
Rene Scharfe2b603562006-10-26 18:52:39 +02001037 if (opt->show_root_diff) {
Brandon Williams7b8dea02017-05-30 10:30:57 -07001038 diff_root_tree_oid(oid, "", &opt->diffopt);
Rene Scharfe2b603562006-10-26 18:52:39 +02001039 log_tree_diff_flush(opt);
1040 }
Linus Torvalds91539832006-04-17 11:59:32 -07001041 return !opt->loginfo;
Junio C Hamano5f1c3f02006-04-09 01:11:11 -07001042 }
1043
Sergey Organova6d19ec2020-12-21 18:19:53 +03001044 if (is_merge) {
Elijah Newrendb757e82022-02-02 02:37:28 +00001045 int octopus = (parents->next->next != NULL);
1046
1047 if (opt->remerge_diff) {
1048 if (octopus) {
1049 show_log(opt);
1050 fprintf(opt->diffopt.file,
1051 "diff: warning: Skipping remerge-diff "
1052 "for octopus merges.\n");
1053 return 1;
1054 }
1055 return do_remerge_diff(opt, parents, oid, commit);
1056 }
Sergey Organov1a2c4d82020-12-21 18:19:46 +03001057 if (opt->combine_merges)
Junio C Hamano5f1c3f02006-04-09 01:11:11 -07001058 return do_diff_combined(opt, commit);
Sergey Organov1a2c4d82020-12-21 18:19:46 +03001059 if (opt->separate_merges) {
1060 if (!opt->first_parent_merges) {
1061 /* Show parent info for multiple diffs */
1062 log->parent = parents->item;
1063 }
1064 } else
1065 return 0;
Junio C Hamano5f1c3f02006-04-09 01:11:11 -07001066 }
1067
Linus Torvalds91539832006-04-17 11:59:32 -07001068 showed_log = 0;
1069 for (;;) {
Junio C Hamano5f1c3f02006-04-09 01:11:11 -07001070 struct commit *parent = parents->item;
Junio C Hamano5f1c3f02006-04-09 01:11:11 -07001071
Jeff King7059dcc2013-10-24 04:52:36 -04001072 parse_commit_or_die(parent);
Derrick Stolee2e27bd72018-04-06 19:09:38 +00001073 diff_tree_oid(get_commit_tree_oid(parent),
Brandon Williams66f414f2017-05-30 10:31:03 -07001074 oid, "", &opt->diffopt);
Linus Torvalds91539832006-04-17 11:59:32 -07001075 log_tree_diff_flush(opt);
1076
1077 showed_log |= !opt->loginfo;
1078
1079 /* Set up the log info for the next parent, if any.. */
1080 parents = parents->next;
Sergey Organov3291eea2020-12-21 18:19:40 +03001081 if (!parents || opt->first_parent_merges)
Linus Torvalds91539832006-04-17 11:59:32 -07001082 break;
1083 log->parent = parents->item;
1084 opt->loginfo = log;
Junio C Hamano5f1c3f02006-04-09 01:11:11 -07001085 }
Linus Torvalds91539832006-04-17 11:59:32 -07001086 return showed_log;
1087}
1088
1089int log_tree_commit(struct rev_info *opt, struct commit *commit)
1090{
1091 struct log_info log;
Ævar Arnfjörð Bjarmasone900d492021-02-11 11:45:34 +01001092 int shown;
1093 /* maybe called by e.g. cmd_log_walk(), maybe stand-alone */
1094 int no_free = opt->diffopt.no_free;
Linus Torvalds91539832006-04-17 11:59:32 -07001095
1096 log.commit = commit;
1097 log.parent = NULL;
1098 opt->loginfo = &log;
Ævar Arnfjörð Bjarmasone900d492021-02-11 11:45:34 +01001099 opt->diffopt.no_free = 1;
Linus Torvalds91539832006-04-17 11:59:32 -07001100
Thomas Rast12da1d12013-03-28 17:47:32 +01001101 if (opt->line_level_traverse)
1102 return line_log_print(opt, commit);
1103
Nguyễn Thái Ngọc Duy1b32dec2014-03-25 20:23:27 +07001104 if (opt->track_linear && !opt->linear && !opt->reverse_output_stage)
Johannes Schindelin4d7b0ef2016-06-22 17:01:32 +02001105 fprintf(opt->diffopt.file, "\n%s\n", opt->break_bar);
Junio C Hamano3eefc182006-04-18 16:45:27 -07001106 shown = log_tree_diff(opt, commit, &log);
1107 if (!shown && opt->loginfo && opt->always_show_header) {
Linus Torvalds91539832006-04-17 11:59:32 -07001108 log.parent = NULL;
Adam Simpkins02865652008-04-29 01:32:59 -07001109 show_log(opt);
Junio C Hamano3eefc182006-04-18 16:45:27 -07001110 shown = 1;
Linus Torvalds91539832006-04-17 11:59:32 -07001111 }
Nguyễn Thái Ngọc Duy1b32dec2014-03-25 20:23:27 +07001112 if (opt->track_linear && !opt->linear && opt->reverse_output_stage)
Johannes Schindelin4d7b0ef2016-06-22 17:01:32 +02001113 fprintf(opt->diffopt.file, "\n%s\n", opt->break_bar);
Linus Torvalds91539832006-04-17 11:59:32 -07001114 opt->loginfo = NULL;
Johannes Schindelin4d7b0ef2016-06-22 17:01:32 +02001115 maybe_flush_or_die(opt->diffopt.file, "stdout");
Ævar Arnfjörð Bjarmasone900d492021-02-11 11:45:34 +01001116 opt->diffopt.no_free = no_free;
1117 diff_free(&opt->diffopt);
Junio C Hamano3eefc182006-04-18 16:45:27 -07001118 return shown;
Junio C Hamano5f1c3f02006-04-09 01:11:11 -07001119}