]>
Commit | Line | Data |
---|---|---|
5f1c3f07 | 1 | #include "cache.h" |
b2141fc1 | 2 | #include "config.h" |
5f1c3f07 | 3 | #include "diff.h" |
cbd53a21 | 4 | #include "object-store.h" |
109cd76d | 5 | #include "repository.h" |
5f1c3f07 | 6 | #include "commit.h" |
cab4feb6 | 7 | #include "tag.h" |
7fefda5c | 8 | #include "graph.h" |
5f1c3f07 | 9 | #include "log-tree.h" |
8860fd42 | 10 | #include "reflog-walk.h" |
cab4feb6 | 11 | #include "refs.h" |
b079c50e | 12 | #include "string-list.h" |
67a4b586 | 13 | #include "color.h" |
0c37f1fc | 14 | #include "gpg-interface.h" |
959a2623 | 15 | #include "sequencer.h" |
12da1d1f | 16 | #include "line-log.h" |
3ac68a93 | 17 | #include "help.h" |
ee6cbf71 | 18 | #include "interdiff.h" |
40ce4160 | 19 | #include "range-diff.h" |
5f1c3f07 | 20 | |
2608c249 | 21 | static struct decoration name_decoration = { "object names" }; |
76c61fbd JH |
22 | static int decoration_loaded; |
23 | static int decoration_flags; | |
a7524128 | 24 | |
67a4b586 NR |
25 | static char decoration_colors[][COLOR_MAXLEN] = { |
26 | GIT_COLOR_RESET, | |
27 | GIT_COLOR_BOLD_GREEN, /* REF_LOCAL */ | |
28 | GIT_COLOR_BOLD_RED, /* REF_REMOTE */ | |
29 | GIT_COLOR_BOLD_YELLOW, /* REF_TAG */ | |
30 | GIT_COLOR_BOLD_MAGENTA, /* REF_STASH */ | |
31 | GIT_COLOR_BOLD_CYAN, /* REF_HEAD */ | |
76f5df30 | 32 | GIT_COLOR_BOLD_BLUE, /* GRAFTED */ |
67a4b586 NR |
33 | }; |
34 | ||
a73b3680 NTND |
35 | static const char *color_decorate_slots[] = { |
36 | [DECORATION_REF_LOCAL] = "branch", | |
37 | [DECORATION_REF_REMOTE] = "remoteBranch", | |
38 | [DECORATION_REF_TAG] = "tag", | |
39 | [DECORATION_REF_STASH] = "stash", | |
40 | [DECORATION_REF_HEAD] = "HEAD", | |
09c4ba41 | 41 | [DECORATION_GRAFTED] = "grafted", |
a73b3680 NTND |
42 | }; |
43 | ||
67a4b586 NR |
44 | static const char *decorate_get_color(int decorate_use_color, enum decoration_type ix) |
45 | { | |
daa0c3d9 | 46 | if (want_color(decorate_use_color)) |
67a4b586 NR |
47 | return decoration_colors[ix]; |
48 | return ""; | |
49 | } | |
50 | ||
3ac68a93 | 51 | define_list_config_array(color_decorate_slots); |
5e11bee6 | 52 | |
8852117a | 53 | int parse_decorate_color_config(const char *var, const char *slot_name, const char *value) |
5e11bee6 | 54 | { |
a73b3680 | 55 | int slot = LOOKUP_CONFIG(color_decorate_slots, slot_name); |
5e11bee6 NR |
56 | if (slot < 0) |
57 | return 0; | |
58 | if (!value) | |
59 | return config_error_nonbool(var); | |
f6c5a296 | 60 | return color_parse(value, decoration_colors[slot]); |
5e11bee6 NR |
61 | } |
62 | ||
67a4b586 NR |
63 | /* |
64 | * log-tree.c uses DIFF_OPT_TST for determining whether to use color | |
65 | * for showing the commit sha1, use the same check for --decorate | |
66 | */ | |
67 | #define decorate_get_color_opt(o, ix) \ | |
f1c96261 | 68 | decorate_get_color((o)->use_color, ix) |
67a4b586 | 69 | |
662174d2 | 70 | void add_name_decoration(enum decoration_type type, const char *name, struct object *obj) |
cab4feb6 | 71 | { |
96ffc06f JK |
72 | struct name_decoration *res; |
73 | FLEX_ALLOC_STR(res, name, name); | |
a7524128 | 74 | res->type = type; |
cab4feb6 RS |
75 | res->next = add_decoration(&name_decoration, obj, res); |
76 | } | |
77 | ||
2608c249 JK |
78 | const struct name_decoration *get_name_decoration(const struct object *obj) |
79 | { | |
0cc7380d | 80 | load_ref_decorations(NULL, DECORATE_SHORT_REFS); |
2608c249 JK |
81 | return lookup_decoration(&name_decoration, obj); |
82 | } | |
83 | ||
f124b730 MH |
84 | static int add_ref_decoration(const char *refname, const struct object_id *oid, |
85 | int flags, void *cb_data) | |
cab4feb6 | 86 | { |
5267d292 | 87 | struct object *obj; |
a7524128 | 88 | enum decoration_type type = DECORATION_NONE; |
65516f58 | 89 | struct decoration_filter *filter = (struct decoration_filter *)cb_data; |
5267d292 | 90 | |
65516f58 RA |
91 | if (filter && !ref_filter_match(refname, |
92 | filter->include_ref_pattern, | |
93 | filter->exclude_ref_pattern)) | |
94 | return 0; | |
429ad204 | 95 | |
58d121b2 | 96 | if (starts_with(refname, git_replace_ref_base)) { |
3d79f657 | 97 | struct object_id original_oid; |
6ebd1caf | 98 | if (!read_replace_refs) |
b9ad5002 | 99 | return 0; |
31a0ad54 JH |
100 | if (get_oid_hex(refname + strlen(git_replace_ref_base), |
101 | &original_oid)) { | |
5267d292 NTND |
102 | warning("invalid replace ref %s", refname); |
103 | return 0; | |
104 | } | |
109cd76d | 105 | obj = parse_object(the_repository, &original_oid); |
5267d292 NTND |
106 | if (obj) |
107 | add_name_decoration(DECORATION_GRAFTED, "replaced", obj); | |
108 | return 0; | |
109 | } | |
110 | ||
109cd76d | 111 | obj = parse_object(the_repository, oid); |
cab4feb6 RS |
112 | if (!obj) |
113 | return 0; | |
a7524128 | 114 | |
59556548 | 115 | if (starts_with(refname, "refs/heads/")) |
a7524128 | 116 | type = DECORATION_REF_LOCAL; |
59556548 | 117 | else if (starts_with(refname, "refs/remotes/")) |
a7524128 | 118 | type = DECORATION_REF_REMOTE; |
59556548 | 119 | else if (starts_with(refname, "refs/tags/")) |
a7524128 | 120 | type = DECORATION_REF_TAG; |
97ba642b | 121 | else if (!strcmp(refname, "refs/stash")) |
a7524128 | 122 | type = DECORATION_REF_STASH; |
97ba642b | 123 | else if (!strcmp(refname, "HEAD")) |
a7524128 NR |
124 | type = DECORATION_REF_HEAD; |
125 | ||
a7524128 | 126 | add_name_decoration(type, refname, obj); |
cab4feb6 RS |
127 | while (obj->type == OBJ_TAG) { |
128 | obj = ((struct tag *)obj)->tagged; | |
129 | if (!obj) | |
130 | break; | |
5e1361cc | 131 | if (!obj->parsed) |
109cd76d | 132 | parse_object(the_repository, &obj->oid); |
a7524128 | 133 | add_name_decoration(DECORATION_REF_TAG, refname, obj); |
cab4feb6 RS |
134 | } |
135 | return 0; | |
136 | } | |
137 | ||
76f5df30 NTND |
138 | static int add_graft_decoration(const struct commit_graft *graft, void *cb_data) |
139 | { | |
c1f5eb49 | 140 | struct commit *commit = lookup_commit(the_repository, &graft->oid); |
76f5df30 NTND |
141 | if (!commit) |
142 | return 0; | |
143 | add_name_decoration(DECORATION_GRAFTED, "grafted", &commit->object); | |
144 | return 0; | |
145 | } | |
146 | ||
65516f58 | 147 | void load_ref_decorations(struct decoration_filter *filter, int flags) |
cab4feb6 | 148 | { |
76c61fbd | 149 | if (!decoration_loaded) { |
65516f58 RA |
150 | if (filter) { |
151 | struct string_list_item *item; | |
152 | for_each_string_list_item(item, filter->exclude_ref_pattern) { | |
153 | normalize_glob_ref(item, NULL, item->string); | |
154 | } | |
155 | for_each_string_list_item(item, filter->include_ref_pattern) { | |
156 | normalize_glob_ref(item, NULL, item->string); | |
157 | } | |
158 | } | |
76c61fbd JH |
159 | decoration_loaded = 1; |
160 | decoration_flags = flags; | |
65516f58 RA |
161 | for_each_ref(add_ref_decoration, filter); |
162 | head_ref(add_ref_decoration, filter); | |
163 | for_each_commit_graft(add_graft_decoration, filter); | |
cab4feb6 RS |
164 | } |
165 | } | |
166 | ||
4d7b0efc | 167 | static void show_parents(struct commit *commit, int abbrev, FILE *file) |
c8c893c6 LT |
168 | { |
169 | struct commit_list *p; | |
170 | for (p = commit->parents; p ; p = p->next) { | |
171 | struct commit *parent = p->item; | |
aab9583f | 172 | fprintf(file, " %s", find_unique_abbrev(&parent->object.oid, abbrev)); |
c8c893c6 LT |
173 | } |
174 | } | |
175 | ||
91b849b2 JS |
176 | static void show_children(struct rev_info *opt, struct commit *commit, int abbrev) |
177 | { | |
178 | struct commit_list *p = lookup_decoration(&opt->children, &commit->object); | |
179 | for ( ; p; p = p->next) { | |
aab9583f | 180 | fprintf(opt->diffopt.file, " %s", find_unique_abbrev(&p->item->object.oid, abbrev)); |
91b849b2 JS |
181 | } |
182 | } | |
183 | ||
51ff0f27 JH |
184 | /* |
185 | * Do we have HEAD in the output, and also the branch it points at? | |
186 | * If so, find that decoration entry for that current branch. | |
187 | */ | |
188 | static const struct name_decoration *current_pointed_by_HEAD(const struct name_decoration *decoration) | |
189 | { | |
190 | const struct name_decoration *list, *head = NULL; | |
191 | const char *branch_name = NULL; | |
51ff0f27 JH |
192 | int rru_flags; |
193 | ||
194 | /* First find HEAD */ | |
195 | for (list = decoration; list; list = list->next) | |
196 | if (list->type == DECORATION_REF_HEAD) { | |
197 | head = list; | |
198 | break; | |
199 | } | |
200 | if (!head) | |
201 | return NULL; | |
202 | ||
203 | /* Now resolve and find the matching current branch */ | |
744c040b | 204 | branch_name = resolve_ref_unsafe("HEAD", 0, NULL, &rru_flags); |
d79be498 | 205 | if (!branch_name || !(rru_flags & REF_ISSYMREF)) |
51ff0f27 | 206 | return NULL; |
76c61fbd | 207 | |
429ad204 | 208 | if (!starts_with(branch_name, "refs/")) |
51ff0f27 JH |
209 | return NULL; |
210 | ||
211 | /* OK, do we have that ref in the list? */ | |
212 | for (list = decoration; list; list = list->next) | |
213 | if ((list->type == DECORATION_REF_LOCAL) && | |
214 | !strcmp(branch_name, list->name)) { | |
215 | return list; | |
216 | } | |
217 | ||
218 | return NULL; | |
219 | } | |
220 | ||
429ad204 JH |
221 | static void show_name(struct strbuf *sb, const struct name_decoration *decoration) |
222 | { | |
223 | if (decoration_flags == DECORATE_SHORT_REFS) | |
224 | strbuf_addstr(sb, prettify_refname(decoration->name)); | |
225 | else | |
226 | strbuf_addstr(sb, decoration->name); | |
227 | } | |
228 | ||
9d3f002f | 229 | /* |
9271095c HJ |
230 | * The caller makes sure there is no funny color before calling. |
231 | * format_decorations_extended makes sure the same after return. | |
9d3f002f | 232 | */ |
9271095c | 233 | void format_decorations_extended(struct strbuf *sb, |
9d3f002f | 234 | const struct commit *commit, |
9271095c HJ |
235 | int use_color, |
236 | const char *prefix, | |
237 | const char *separator, | |
238 | const char *suffix) | |
ca135e7a | 239 | { |
2608c249 | 240 | const struct name_decoration *decoration; |
51ff0f27 | 241 | const struct name_decoration *current_and_HEAD; |
67a4b586 | 242 | const char *color_commit = |
9d3f002f | 243 | diff_get_color(use_color, DIFF_COMMIT); |
67a4b586 | 244 | const char *color_reset = |
9d3f002f | 245 | decorate_get_color(use_color, DECORATION_NONE); |
ca135e7a | 246 | |
2608c249 | 247 | decoration = get_name_decoration(&commit->object); |
ca135e7a LT |
248 | if (!decoration) |
249 | return; | |
51ff0f27 JH |
250 | |
251 | current_and_HEAD = current_pointed_by_HEAD(decoration); | |
ca135e7a | 252 | while (decoration) { |
51ff0f27 JH |
253 | /* |
254 | * When both current and HEAD are there, only | |
255 | * show HEAD->current where HEAD would have | |
256 | * appeared, skipping the entry for current. | |
257 | */ | |
258 | if (decoration != current_and_HEAD) { | |
259 | strbuf_addstr(sb, color_commit); | |
260 | strbuf_addstr(sb, prefix); | |
261 | strbuf_addstr(sb, color_reset); | |
262 | strbuf_addstr(sb, decorate_get_color(use_color, decoration->type)); | |
263 | if (decoration->type == DECORATION_REF_TAG) | |
264 | strbuf_addstr(sb, "tag: "); | |
265 | ||
429ad204 | 266 | show_name(sb, decoration); |
51ff0f27 JH |
267 | |
268 | if (current_and_HEAD && | |
269 | decoration->type == DECORATION_REF_HEAD) { | |
51ff0f27 JH |
270 | strbuf_addstr(sb, " -> "); |
271 | strbuf_addstr(sb, color_reset); | |
272 | strbuf_addstr(sb, decorate_get_color(use_color, current_and_HEAD->type)); | |
429ad204 | 273 | show_name(sb, current_and_HEAD); |
51ff0f27 JH |
274 | } |
275 | strbuf_addstr(sb, color_reset); | |
276 | ||
277 | prefix = separator; | |
278 | } | |
ca135e7a LT |
279 | decoration = decoration->next; |
280 | } | |
9d3f002f | 281 | strbuf_addstr(sb, color_commit); |
9271095c | 282 | strbuf_addstr(sb, suffix); |
9d3f002f NTND |
283 | strbuf_addstr(sb, color_reset); |
284 | } | |
285 | ||
286 | void show_decorations(struct rev_info *opt, struct commit *commit) | |
287 | { | |
288 | struct strbuf sb = STRBUF_INIT; | |
289 | ||
87be2523 NTND |
290 | if (opt->sources) { |
291 | char **slot = revision_sources_peek(opt->sources, commit); | |
292 | ||
293 | if (slot && *slot) | |
294 | fprintf(opt->diffopt.file, "\t%s", *slot); | |
295 | } | |
9d3f002f NTND |
296 | if (!opt->show_decorations) |
297 | return; | |
298 | format_decorations(&sb, commit, opt->diffopt.use_color); | |
4d7b0efc | 299 | fputs(sb.buf, opt->diffopt.file); |
9d3f002f | 300 | strbuf_release(&sb); |
ca135e7a LT |
301 | } |
302 | ||
e00de24b JS |
303 | static unsigned int digits_in_number(unsigned int number) |
304 | { | |
305 | unsigned int i = 10, result = 1; | |
306 | while (i <= number) { | |
307 | i *= 10; | |
308 | result++; | |
309 | } | |
310 | return result; | |
311 | } | |
312 | ||
d28b5d47 JH |
313 | void fmt_output_subject(struct strbuf *filename, |
314 | const char *subject, | |
021f2f4c | 315 | struct rev_info *info) |
6fa8e627 | 316 | { |
021f2f4c JH |
317 | const char *suffix = info->patch_suffix; |
318 | int nr = info->nr; | |
d28b5d47 JH |
319 | int start_len = filename->len; |
320 | int max_len = start_len + FORMAT_PATCH_NAME_MAX - (strlen(suffix) + 1); | |
321 | ||
5fe10fe8 JH |
322 | if (0 < info->reroll_count) |
323 | strbuf_addf(filename, "v%d-", info->reroll_count); | |
d28b5d47 JH |
324 | strbuf_addf(filename, "%04d-%s", nr, subject); |
325 | ||
326 | if (max_len < filename->len) | |
327 | strbuf_setlen(filename, max_len); | |
328 | strbuf_addstr(filename, suffix); | |
329 | } | |
330 | ||
331 | void fmt_output_commit(struct strbuf *filename, | |
332 | struct commit *commit, | |
333 | struct rev_info *info) | |
334 | { | |
335 | struct pretty_print_context ctx = {0}; | |
336 | struct strbuf subject = STRBUF_INIT; | |
337 | ||
338 | format_commit_message(commit, "%f", &subject, &ctx); | |
339 | fmt_output_subject(filename, subject.buf, info); | |
340 | strbuf_release(&subject); | |
6fa8e627 SB |
341 | } |
342 | ||
8ffc8dc6 RS |
343 | void fmt_output_email_subject(struct strbuf *sb, struct rev_info *opt) |
344 | { | |
345 | if (opt->total > 0) { | |
346 | strbuf_addf(sb, "Subject: [%s%s%0*d/%d] ", | |
347 | opt->subject_prefix, | |
348 | *opt->subject_prefix ? " " : "", | |
349 | digits_in_number(opt->total), | |
350 | opt->nr, opt->total); | |
351 | } else if (opt->total == 0 && opt->subject_prefix && *opt->subject_prefix) { | |
352 | strbuf_addf(sb, "Subject: [%s] ", | |
353 | opt->subject_prefix); | |
354 | } else { | |
355 | strbuf_addstr(sb, "Subject: "); | |
356 | } | |
357 | } | |
358 | ||
108dab28 | 359 | void log_write_email_headers(struct rev_info *opt, struct commit *commit, |
267123b4 | 360 | const char **extra_headers_p, |
50cd54ef | 361 | int *need_8bit_cte_p, |
362 | int maybe_multipart) | |
b02bd65f | 363 | { |
b02bd65f | 364 | const char *extra_headers = opt->extra_headers; |
3a30aa17 | 365 | const char *name = oid_to_hex(opt->zero_commit ? |
366 | &null_oid : &commit->object.oid); | |
267123b4 JH |
367 | |
368 | *need_8bit_cte_p = 0; /* unknown */ | |
b02bd65f | 369 | |
4d7b0efc | 370 | fprintf(opt->diffopt.file, "From %s Mon Sep 17 00:00:00 2001\n", name); |
7fefda5c AS |
371 | graph_show_oneline(opt->graph); |
372 | if (opt->message_id) { | |
4d7b0efc | 373 | fprintf(opt->diffopt.file, "Message-Id: <%s>\n", opt->message_id); |
7fefda5c AS |
374 | graph_show_oneline(opt->graph); |
375 | } | |
b079c50e TR |
376 | if (opt->ref_message_ids && opt->ref_message_ids->nr > 0) { |
377 | int i, n; | |
378 | n = opt->ref_message_ids->nr; | |
4d7b0efc | 379 | fprintf(opt->diffopt.file, "In-Reply-To: <%s>\n", opt->ref_message_ids->items[n-1].string); |
b079c50e | 380 | for (i = 0; i < n; i++) |
4d7b0efc | 381 | fprintf(opt->diffopt.file, "%s<%s>\n", (i > 0 ? "\t" : "References: "), |
b079c50e | 382 | opt->ref_message_ids->items[i].string); |
7fefda5c AS |
383 | graph_show_oneline(opt->graph); |
384 | } | |
50cd54ef | 385 | if (opt->mime_boundary && maybe_multipart) { |
d50b69b8 JK |
386 | static struct strbuf subject_buffer = STRBUF_INIT; |
387 | static struct strbuf buffer = STRBUF_INIT; | |
108dab28 | 388 | struct strbuf filename = STRBUF_INIT; |
267123b4 | 389 | *need_8bit_cte_p = -1; /* NEVER */ |
d50b69b8 JK |
390 | |
391 | strbuf_reset(&subject_buffer); | |
392 | strbuf_reset(&buffer); | |
393 | ||
394 | strbuf_addf(&subject_buffer, | |
b02bd65f DB |
395 | "%s" |
396 | "MIME-Version: 1.0\n" | |
397 | "Content-Type: multipart/mixed;" | |
398 | " boundary=\"%s%s\"\n" | |
399 | "\n" | |
400 | "This is a multi-part message in MIME " | |
401 | "format.\n" | |
402 | "--%s%s\n" | |
403 | "Content-Type: text/plain; " | |
404 | "charset=UTF-8; format=fixed\n" | |
405 | "Content-Transfer-Encoding: 8bit\n\n", | |
406 | extra_headers ? extra_headers : "", | |
407 | mime_boundary_leader, opt->mime_boundary, | |
408 | mime_boundary_leader, opt->mime_boundary); | |
d50b69b8 | 409 | extra_headers = subject_buffer.buf; |
b02bd65f | 410 | |
38ec23ac JH |
411 | if (opt->numbered_files) |
412 | strbuf_addf(&filename, "%d", opt->nr); | |
413 | else | |
d28b5d47 | 414 | fmt_output_commit(&filename, commit, opt); |
d50b69b8 | 415 | strbuf_addf(&buffer, |
6b2fbaaf | 416 | "\n--%s%s\n" |
b02bd65f | 417 | "Content-Type: text/x-patch;" |
108dab28 | 418 | " name=\"%s\"\n" |
b02bd65f DB |
419 | "Content-Transfer-Encoding: 8bit\n" |
420 | "Content-Disposition: %s;" | |
108dab28 | 421 | " filename=\"%s\"\n\n", |
b02bd65f | 422 | mime_boundary_leader, opt->mime_boundary, |
108dab28 | 423 | filename.buf, |
b02bd65f | 424 | opt->no_inline ? "attachment" : "inline", |
108dab28 | 425 | filename.buf); |
d50b69b8 | 426 | opt->diffopt.stat_sep = buffer.buf; |
108dab28 | 427 | strbuf_release(&filename); |
b02bd65f | 428 | } |
b02bd65f DB |
429 | *extra_headers_p = extra_headers; |
430 | } | |
431 | ||
c6b3ec41 JH |
432 | static void show_sig_lines(struct rev_info *opt, int status, const char *bol) |
433 | { | |
434 | const char *color, *reset, *eol; | |
435 | ||
436 | color = diff_get_color_opt(&opt->diffopt, | |
437 | status ? DIFF_WHITESPACE : DIFF_FRAGINFO); | |
438 | reset = diff_get_color_opt(&opt->diffopt, DIFF_RESET); | |
439 | while (*bol) { | |
440 | eol = strchrnul(bol, '\n'); | |
4d7b0efc | 441 | fprintf(opt->diffopt.file, "%s%.*s%s%s", color, (int)(eol - bol), bol, reset, |
c6b3ec41 | 442 | *eol ? "\n" : ""); |
cf3983d1 | 443 | graph_show_oneline(opt->graph); |
c6b3ec41 JH |
444 | bol = (*eol) ? (eol + 1) : eol; |
445 | } | |
446 | } | |
447 | ||
0c37f1fc JH |
448 | static void show_signature(struct rev_info *opt, struct commit *commit) |
449 | { | |
450 | struct strbuf payload = STRBUF_INIT; | |
451 | struct strbuf signature = STRBUF_INIT; | |
452 | struct strbuf gpg_output = STRBUF_INIT; | |
453 | int status; | |
0c37f1fc | 454 | |
218aa3a6 | 455 | if (parse_signed_commit(commit, &payload, &signature) <= 0) |
0c37f1fc JH |
456 | goto out; |
457 | ||
458 | status = verify_signed_buffer(payload.buf, payload.len, | |
459 | signature.buf, signature.len, | |
9cc4ac8f | 460 | &gpg_output, NULL); |
0c37f1fc JH |
461 | if (status && !gpg_output.len) |
462 | strbuf_addstr(&gpg_output, "No signature\n"); | |
463 | ||
c6b3ec41 | 464 | show_sig_lines(opt, status, gpg_output.buf); |
0c37f1fc JH |
465 | |
466 | out: | |
467 | strbuf_release(&gpg_output); | |
468 | strbuf_release(&payload); | |
469 | strbuf_release(&signature); | |
470 | } | |
471 | ||
a92ea68f | 472 | static int which_parent(const struct object_id *oid, const struct commit *commit) |
824958e5 JH |
473 | { |
474 | int nth; | |
475 | const struct commit_list *parent; | |
476 | ||
477 | for (nth = 0, parent = commit->parents; parent; parent = parent->next) { | |
4a7e27e9 | 478 | if (oideq(&parent->item->object.oid, oid)) |
824958e5 JH |
479 | return nth; |
480 | nth++; | |
481 | } | |
482 | return -1; | |
483 | } | |
484 | ||
d041ffa5 JH |
485 | static int is_common_merge(const struct commit *commit) |
486 | { | |
487 | return (commit->parents | |
488 | && commit->parents->next | |
489 | && !commit->parents->next->next); | |
490 | } | |
491 | ||
fef461ea JS |
492 | static int show_one_mergetag(struct commit *commit, |
493 | struct commit_extra_header *extra, | |
494 | void *data) | |
824958e5 | 495 | { |
063da62b | 496 | struct rev_info *opt = (struct rev_info *)data; |
a92ea68f | 497 | struct object_id oid; |
824958e5 JH |
498 | struct tag *tag; |
499 | struct strbuf verify_message; | |
500 | int status, nth; | |
501 | size_t payload_size, gpg_message_offset; | |
502 | ||
169c9c01 | 503 | hash_object_file(extra->value, extra->len, type_name(OBJ_TAG), &oid); |
ce71efb7 | 504 | tag = lookup_tag(the_repository, &oid); |
824958e5 | 505 | if (!tag) |
fef461ea | 506 | return -1; /* error message already given */ |
824958e5 JH |
507 | |
508 | strbuf_init(&verify_message, 256); | |
0e740fed | 509 | if (parse_tag_buffer(the_repository, tag, extra->value, extra->len)) |
824958e5 | 510 | strbuf_addstr(&verify_message, "malformed mergetag\n"); |
d041ffa5 | 511 | else if (is_common_merge(commit) && |
4a7e27e9 JK |
512 | oideq(&tag->tagged->oid, |
513 | &commit->parents->next->item->object.oid)) | |
d041ffa5 JH |
514 | strbuf_addf(&verify_message, |
515 | "merged tag '%s'\n", tag->tag); | |
a92ea68f | 516 | else if ((nth = which_parent(&tag->tagged->oid, commit)) < 0) |
824958e5 | 517 | strbuf_addf(&verify_message, "tag %s names a non-parent %s\n", |
ed1c9977 | 518 | tag->tag, tag->tagged->oid.hash); |
824958e5 JH |
519 | else |
520 | strbuf_addf(&verify_message, | |
521 | "parent #%d, tagged '%s'\n", nth + 1, tag->tag); | |
522 | gpg_message_offset = verify_message.len; | |
523 | ||
524 | payload_size = parse_signature(extra->value, extra->len); | |
1315093f | 525 | status = -1; |
42c55ce4 MG |
526 | if (extra->len > payload_size) { |
527 | /* could have a good signature */ | |
528 | if (!verify_signed_buffer(extra->value, payload_size, | |
529 | extra->value + payload_size, | |
530 | extra->len - payload_size, | |
531 | &verify_message, NULL)) | |
532 | status = 0; /* good */ | |
533 | else if (verify_message.len <= gpg_message_offset) | |
534 | strbuf_addstr(&verify_message, "No signature\n"); | |
535 | /* otherwise we couldn't verify, which is shown as bad */ | |
536 | } | |
824958e5 JH |
537 | |
538 | show_sig_lines(opt, status, verify_message.buf); | |
539 | strbuf_release(&verify_message); | |
fef461ea | 540 | return 0; |
824958e5 JH |
541 | } |
542 | ||
fef461ea | 543 | static int show_mergetag(struct rev_info *opt, struct commit *commit) |
824958e5 | 544 | { |
fef461ea | 545 | return for_each_mergetag(show_one_mergetag, commit, opt); |
824958e5 JH |
546 | } |
547 | ||
3fcc7a23 ES |
548 | static void next_commentary_block(struct rev_info *opt, struct strbuf *sb) |
549 | { | |
550 | const char *x = opt->shown_dashes ? "\n" : "---\n"; | |
551 | if (sb) | |
552 | strbuf_addstr(sb, x); | |
553 | else | |
554 | fputs(x, opt->diffopt.file); | |
555 | opt->shown_dashes = 1; | |
556 | } | |
557 | ||
02865655 | 558 | void show_log(struct rev_info *opt) |
91539833 | 559 | { |
f285a2d7 | 560 | struct strbuf msgbuf = STRBUF_INIT; |
39bc9a6c | 561 | struct log_info *log = opt->loginfo; |
91539833 | 562 | struct commit *commit = log->commit, *parent = log->parent; |
2ed1960a | 563 | int abbrev_commit = opt->abbrev_commit ? opt->abbrev : the_hash_algo->hexsz; |
dd2e794a TR |
564 | const char *extra_headers = opt->extra_headers; |
565 | struct pretty_print_context ctx = {0}; | |
91539833 LT |
566 | |
567 | opt->loginfo = NULL; | |
568 | if (!opt->verbose_header) { | |
7fefda5c AS |
569 | graph_show_commit(opt->graph); |
570 | ||
1df2d656 | 571 | if (!opt->graph) |
b1b47554 | 572 | put_revision_mark(opt, commit); |
aab9583f | 573 | fputs(find_unique_abbrev(&commit->object.oid, abbrev_commit), opt->diffopt.file); |
885cf808 | 574 | if (opt->print_parents) |
4d7b0efc | 575 | show_parents(commit, abbrev_commit, opt->diffopt.file); |
91b849b2 JS |
576 | if (opt->children.name) |
577 | show_children(opt, commit, abbrev_commit); | |
0f3a290b | 578 | show_decorations(opt, commit); |
7fefda5c | 579 | if (opt->graph && !graph_is_commit_finished(opt->graph)) { |
4d7b0efc | 580 | putc('\n', opt->diffopt.file); |
7fefda5c AS |
581 | graph_show_remainder(opt->graph); |
582 | } | |
4d7b0efc | 583 | putc(opt->diffopt.line_termination, opt->diffopt.file); |
91539833 LT |
584 | return; |
585 | } | |
586 | ||
587 | /* | |
8715227d JK |
588 | * If use_terminator is set, we already handled any record termination |
589 | * at the end of the last record. | |
02865655 AS |
590 | * Otherwise, add a diffopt.line_termination character before all |
591 | * entries but the first. (IOW, as a separator between entries) | |
91539833 | 592 | */ |
7fefda5c AS |
593 | if (opt->shown_one && !opt->use_terminator) { |
594 | /* | |
595 | * If entries are separated by a newline, the output | |
596 | * should look human-readable. If the last entry ended | |
597 | * with a newline, print the graph output before this | |
598 | * newline. Otherwise it will end up as a completely blank | |
599 | * line and will look like a gap in the graph. | |
600 | * | |
601 | * If the entry separator is not a newline, the output is | |
602 | * primarily intended for programmatic consumption, and we | |
603 | * never want the extra graph output before the entry | |
604 | * separator. | |
605 | */ | |
606 | if (opt->diffopt.line_termination == '\n' && | |
607 | !opt->missing_newline) | |
608 | graph_show_padding(opt->graph); | |
4d7b0efc | 609 | putc(opt->diffopt.line_termination, opt->diffopt.file); |
7fefda5c | 610 | } |
91539833 LT |
611 | opt->shown_one = 1; |
612 | ||
7fefda5c AS |
613 | /* |
614 | * If the history graph was requested, | |
615 | * print the graph, up to this commit's line | |
616 | */ | |
617 | graph_show_commit(opt->graph); | |
618 | ||
91539833 LT |
619 | /* |
620 | * Print header line of header.. | |
621 | */ | |
3eefc189 | 622 | |
9f23e040 | 623 | if (cmit_fmt_is_mail(opt->commit_format)) { |
6d167fd7 | 624 | log_write_email_headers(opt, commit, &extra_headers, |
50cd54ef | 625 | &ctx.need_8bit_cte, 1); |
6d167fd7 RS |
626 | ctx.rev = opt; |
627 | ctx.print_email_subject = 1; | |
e52a5de4 | 628 | } else if (opt->commit_format != CMIT_FMT_USERFORMAT) { |
4d7b0efc | 629 | fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), opt->diffopt.file); |
74bd9029 | 630 | if (opt->commit_format != CMIT_FMT_ONELINE) |
4d7b0efc | 631 | fputs("commit ", opt->diffopt.file); |
7528f27d | 632 | |
1df2d656 | 633 | if (!opt->graph) |
b1b47554 | 634 | put_revision_mark(opt, commit); |
aab9583f | 635 | fputs(find_unique_abbrev(&commit->object.oid, |
636 | abbrev_commit), | |
4d7b0efc | 637 | opt->diffopt.file); |
885cf808 | 638 | if (opt->print_parents) |
4d7b0efc | 639 | show_parents(commit, abbrev_commit, opt->diffopt.file); |
91b849b2 JS |
640 | if (opt->children.name) |
641 | show_children(opt, commit, abbrev_commit); | |
73f0a157 | 642 | if (parent) |
4d7b0efc | 643 | fprintf(opt->diffopt.file, " (from %s)", |
aab9583f | 644 | find_unique_abbrev(&parent->object.oid, abbrev_commit)); |
4d7b0efc | 645 | fputs(diff_get_color_opt(&opt->diffopt, DIFF_RESET), opt->diffopt.file); |
0f3a290b | 646 | show_decorations(opt, commit); |
7fefda5c | 647 | if (opt->commit_format == CMIT_FMT_ONELINE) { |
4d7b0efc | 648 | putc(' ', opt->diffopt.file); |
7fefda5c | 649 | } else { |
4d7b0efc | 650 | putc('\n', opt->diffopt.file); |
7fefda5c AS |
651 | graph_show_oneline(opt->graph); |
652 | } | |
903b45fe | 653 | if (opt->reflog_info) { |
7fefda5c AS |
654 | /* |
655 | * setup_revisions() ensures that opt->reflog_info | |
656 | * and opt->graph cannot both be set, | |
657 | * so we don't need to worry about printing the | |
658 | * graph info here. | |
659 | */ | |
4d12a471 | 660 | show_reflog_message(opt->reflog_info, |
55ccf85a | 661 | opt->commit_format == CMIT_FMT_ONELINE, |
a5481a6c | 662 | &opt->date_mode, |
55ccf85a | 663 | opt->date_mode_explicit); |
02865655 | 664 | if (opt->commit_format == CMIT_FMT_ONELINE) |
903b45fe | 665 | return; |
903b45fe | 666 | } |
3eefc189 | 667 | } |
91539833 | 668 | |
824958e5 | 669 | if (opt->show_signature) { |
0c37f1fc | 670 | show_signature(opt, commit); |
824958e5 JH |
671 | show_mergetag(opt, commit); |
672 | } | |
0c37f1fc | 673 | |
ddf333f6 JH |
674 | if (opt->show_notes) { |
675 | int raw; | |
676 | struct strbuf notebuf = STRBUF_INIT; | |
677 | ||
678 | raw = (opt->commit_format == CMIT_FMT_USERFORMAT); | |
fb61e4d3 | 679 | format_display_notes(&commit->object.oid, ¬ebuf, |
ddf333f6 | 680 | get_log_output_encoding(), raw); |
82f51af3 | 681 | ctx.notes_message = strbuf_detach(¬ebuf, NULL); |
ddf333f6 JH |
682 | } |
683 | ||
91539833 LT |
684 | /* |
685 | * And then the pretty-printed message itself | |
686 | */ | |
5289c56a NTND |
687 | if (ctx.need_8bit_cte >= 0 && opt->add_signoff) |
688 | ctx.need_8bit_cte = | |
39ab4d09 | 689 | has_non_ascii(fmt_name(WANT_COMMITTER_IDENT)); |
dd2e794a | 690 | ctx.date_mode = opt->date_mode; |
f026c756 | 691 | ctx.date_mode_explicit = opt->date_mode_explicit; |
dd2e794a TR |
692 | ctx.abbrev = opt->diffopt.abbrev; |
693 | ctx.after_subject = extra_headers; | |
9553d2b2 | 694 | ctx.preserve_subject = opt->preserve_subject; |
8f8f5476 | 695 | ctx.reflog_info = opt->reflog_info; |
6bf13944 | 696 | ctx.fmt = opt->commit_format; |
0e2913b0 | 697 | ctx.mailmap = opt->mailmap; |
30825178 | 698 | ctx.color = opt->diffopt.use_color; |
7cc13c71 | 699 | ctx.expand_tabs_in_log = opt->expand_tabs_in_log; |
ecaee805 | 700 | ctx.output_encoding = get_log_output_encoding(); |
ad6f028f | 701 | ctx.rev = opt; |
a9080475 JK |
702 | if (opt->from_ident.mail_begin && opt->from_ident.name_begin) |
703 | ctx.from_ident = &opt->from_ident; | |
3ad87c80 JK |
704 | if (opt->graph) |
705 | ctx.graph_width = graph_width(opt->graph); | |
6bf13944 | 706 | pretty_print_commit(&ctx, commit, &msgbuf); |
212620fe JH |
707 | |
708 | if (opt->add_signoff) | |
5289c56a | 709 | append_signoff(&msgbuf, 0, APPEND_SIGNOFF_DEDUP); |
212620fe | 710 | |
5a664cf2 | 711 | if ((ctx.fmt != CMIT_FMT_USERFORMAT) && |
bd1470b8 | 712 | ctx.notes_message && *ctx.notes_message) { |
3fcc7a23 ES |
713 | if (cmit_fmt_is_mail(ctx.fmt)) |
714 | next_commentary_block(opt, &msgbuf); | |
5a664cf2 | 715 | strbuf_addstr(&msgbuf, ctx.notes_message); |
bd1470b8 | 716 | } |
cf2251b6 | 717 | |
7fefda5c | 718 | if (opt->show_log_size) { |
4d7b0efc | 719 | fprintf(opt->diffopt.file, "log size %i\n", (int)msgbuf.len); |
7fefda5c AS |
720 | graph_show_oneline(opt->graph); |
721 | } | |
9fa3465d | 722 | |
7fefda5c AS |
723 | /* |
724 | * Set opt->missing_newline if msgbuf doesn't | |
725 | * end in a newline (including if it is empty) | |
726 | */ | |
727 | if (!msgbuf.len || msgbuf.buf[msgbuf.len - 1] != '\n') | |
728 | opt->missing_newline = 1; | |
729 | else | |
730 | opt->missing_newline = 0; | |
731 | ||
660e113c | 732 | graph_show_commit_msg(opt->graph, opt->diffopt.file, &msgbuf); |
b9c7d6e4 | 733 | if (opt->use_terminator && !commit_format_is_empty(opt->commit_format)) { |
7fefda5c AS |
734 | if (!opt->missing_newline) |
735 | graph_show_padding(opt->graph); | |
4d7b0efc | 736 | putc(opt->diffopt.line_termination, opt->diffopt.file); |
7fefda5c AS |
737 | } |
738 | ||
674d1727 | 739 | strbuf_release(&msgbuf); |
ddf333f6 | 740 | free(ctx.notes_message); |
ee6cbf71 ES |
741 | |
742 | if (cmit_fmt_is_mail(ctx.fmt) && opt->idiff_oid1) { | |
743 | struct diff_queue_struct dq; | |
744 | ||
745 | memcpy(&dq, &diff_queued_diff, sizeof(diff_queued_diff)); | |
746 | DIFF_QUEUE_CLEAR(&diff_queued_diff); | |
747 | ||
748 | next_commentary_block(opt, NULL); | |
749 | fprintf_ln(opt->diffopt.file, "%s", opt->idiff_title); | |
750 | show_interdiff(opt, 2); | |
751 | ||
752 | memcpy(&diff_queued_diff, &dq, sizeof(diff_queued_diff)); | |
753 | } | |
40ce4160 ES |
754 | |
755 | if (cmit_fmt_is_mail(ctx.fmt) && opt->rdiff1) { | |
756 | struct diff_queue_struct dq; | |
ac0edf1f | 757 | struct diff_options opts; |
40ce4160 ES |
758 | |
759 | memcpy(&dq, &diff_queued_diff, sizeof(diff_queued_diff)); | |
760 | DIFF_QUEUE_CLEAR(&diff_queued_diff); | |
761 | ||
762 | next_commentary_block(opt, NULL); | |
763 | fprintf_ln(opt->diffopt.file, "%s", opt->rdiff_title); | |
ac0edf1f MÅ |
764 | /* |
765 | * Pass minimum required diff-options to range-diff; others | |
766 | * can be added later if deemed desirable. | |
767 | */ | |
768 | diff_setup(&opts); | |
769 | opts.file = opt->diffopt.file; | |
770 | opts.use_color = opt->diffopt.use_color; | |
771 | diff_setup_done(&opts); | |
40ce4160 | 772 | show_range_diff(opt->rdiff1, opt->rdiff2, |
ac0edf1f | 773 | opt->creation_factor, 1, &opts); |
40ce4160 ES |
774 | |
775 | memcpy(&diff_queued_diff, &dq, sizeof(diff_queued_diff)); | |
776 | } | |
91539833 LT |
777 | } |
778 | ||
cd2bdc53 | 779 | int log_tree_diff_flush(struct rev_info *opt) |
5f1c3f07 | 780 | { |
bd1470b8 | 781 | opt->shown_dashes = 0; |
5f1c3f07 | 782 | diffcore_std(&opt->diffopt); |
91539833 | 783 | |
5f1c3f07 JH |
784 | if (diff_queue_is_empty()) { |
785 | int saved_fmt = opt->diffopt.output_format; | |
786 | opt->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT; | |
787 | diff_flush(&opt->diffopt); | |
788 | opt->diffopt.output_format = saved_fmt; | |
789 | return 0; | |
790 | } | |
91539833 | 791 | |
3969cf7d | 792 | if (opt->loginfo && !opt->no_commit_id) { |
02865655 | 793 | show_log(opt); |
304b5af6 LT |
794 | if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) && |
795 | opt->verbose_header && | |
b9c7d6e4 JK |
796 | opt->commit_format != CMIT_FMT_ONELINE && |
797 | !commit_format_is_empty(opt->commit_format)) { | |
1d34c50f JH |
798 | /* |
799 | * When showing a verbose header (i.e. log message), | |
800 | * and not in --pretty=oneline format, we would want | |
801 | * an extra newline between the end of log and the | |
802 | * diff/diffstat output for readability. | |
803 | */ | |
3969cf7d | 804 | int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH; |
81bd1b2a BY |
805 | if (opt->diffopt.output_prefix) { |
806 | struct strbuf *msg = NULL; | |
807 | msg = opt->diffopt.output_prefix(&opt->diffopt, | |
808 | opt->diffopt.output_prefix_data); | |
4d7b0efc | 809 | fwrite(msg->buf, msg->len, 1, opt->diffopt.file); |
81bd1b2a | 810 | } |
1d34c50f JH |
811 | |
812 | /* | |
813 | * We may have shown three-dashes line early | |
3fcc7a23 ES |
814 | * between generated commentary (notes, etc.) |
815 | * and the log message, in which case we only | |
816 | * want a blank line after the commentary | |
817 | * without (an extra) three-dashes line. | |
1d34c50f JH |
818 | * Otherwise, we show the three-dashes line if |
819 | * we are showing the patch with diffstat, but | |
820 | * in that case, there is no extra blank line | |
821 | * after the three-dashes line. | |
822 | */ | |
823 | if (!opt->shown_dashes && | |
824 | (pch & opt->diffopt.output_format) == pch) | |
4d7b0efc JS |
825 | fprintf(opt->diffopt.file, "---"); |
826 | putc('\n', opt->diffopt.file); | |
3969cf7d JH |
827 | } |
828 | } | |
5f1c3f07 JH |
829 | diff_flush(&opt->diffopt); |
830 | return 1; | |
831 | } | |
832 | ||
cd2bdc53 | 833 | static int do_diff_combined(struct rev_info *opt, struct commit *commit) |
5f1c3f07 | 834 | { |
82889295 | 835 | diff_tree_combined_merge(commit, opt->dense_combined_merges, opt); |
91539833 | 836 | return !opt->loginfo; |
5f1c3f07 JH |
837 | } |
838 | ||
91539833 LT |
839 | /* |
840 | * Show the diff of a commit. | |
841 | * | |
842 | * Return true if we printed any log info messages | |
843 | */ | |
844 | static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log_info *log) | |
5f1c3f07 | 845 | { |
91539833 | 846 | int showed_log; |
5f1c3f07 | 847 | struct commit_list *parents; |
f2fd0760 | 848 | struct object_id *oid; |
5f1c3f07 | 849 | |
0d1e0e78 | 850 | if (!opt->diff && !opt->diffopt.flags.exit_with_status) |
91539833 LT |
851 | return 0; |
852 | ||
7059dccc | 853 | parse_commit_or_die(commit); |
2e27bd77 | 854 | oid = get_commit_tree_oid(commit); |
d1b9b767 | 855 | |
5f1c3f07 | 856 | /* Root commit? */ |
53d00b39 | 857 | parents = get_saved_parents(opt, commit); |
91539833 | 858 | if (!parents) { |
2b60356d | 859 | if (opt->show_root_diff) { |
7b8dea0c | 860 | diff_root_tree_oid(oid, "", &opt->diffopt); |
2b60356d RS |
861 | log_tree_diff_flush(opt); |
862 | } | |
91539833 | 863 | return !opt->loginfo; |
5f1c3f07 JH |
864 | } |
865 | ||
866 | /* More than one parent? */ | |
91539833 | 867 | if (parents && parents->next) { |
5f1c3f07 JH |
868 | if (opt->ignore_merges) |
869 | return 0; | |
870 | else if (opt->combine_merges) | |
871 | return do_diff_combined(opt, commit); | |
88d9d45d PB |
872 | else if (opt->first_parent_only) { |
873 | /* | |
874 | * Generate merge log entry only for the first | |
875 | * parent, showing summary diff of the others | |
876 | * we merged _in_. | |
877 | */ | |
7059dccc | 878 | parse_commit_or_die(parents->item); |
2e27bd77 | 879 | diff_tree_oid(get_commit_tree_oid(parents->item), |
66f414f8 | 880 | oid, "", &opt->diffopt); |
88d9d45d PB |
881 | log_tree_diff_flush(opt); |
882 | return !opt->loginfo; | |
883 | } | |
91539833 LT |
884 | |
885 | /* If we show individual diffs, show the parent info */ | |
886 | log->parent = parents->item; | |
5f1c3f07 JH |
887 | } |
888 | ||
91539833 LT |
889 | showed_log = 0; |
890 | for (;;) { | |
5f1c3f07 | 891 | struct commit *parent = parents->item; |
5f1c3f07 | 892 | |
7059dccc | 893 | parse_commit_or_die(parent); |
2e27bd77 | 894 | diff_tree_oid(get_commit_tree_oid(parent), |
66f414f8 | 895 | oid, "", &opt->diffopt); |
91539833 LT |
896 | log_tree_diff_flush(opt); |
897 | ||
898 | showed_log |= !opt->loginfo; | |
899 | ||
900 | /* Set up the log info for the next parent, if any.. */ | |
901 | parents = parents->next; | |
902 | if (!parents) | |
903 | break; | |
904 | log->parent = parents->item; | |
905 | opt->loginfo = log; | |
906 | } | |
907 | return showed_log; | |
908 | } | |
909 | ||
910 | int log_tree_commit(struct rev_info *opt, struct commit *commit) | |
911 | { | |
912 | struct log_info log; | |
6ea57703 | 913 | int shown, close_file = opt->diffopt.close_file; |
91539833 LT |
914 | |
915 | log.commit = commit; | |
916 | log.parent = NULL; | |
917 | opt->loginfo = &log; | |
6ea57703 | 918 | opt->diffopt.close_file = 0; |
91539833 | 919 | |
12da1d1f TR |
920 | if (opt->line_level_traverse) |
921 | return line_log_print(opt, commit); | |
922 | ||
1b32dece | 923 | if (opt->track_linear && !opt->linear && !opt->reverse_output_stage) |
4d7b0efc | 924 | fprintf(opt->diffopt.file, "\n%s\n", opt->break_bar); |
3eefc189 JH |
925 | shown = log_tree_diff(opt, commit, &log); |
926 | if (!shown && opt->loginfo && opt->always_show_header) { | |
91539833 | 927 | log.parent = NULL; |
02865655 | 928 | show_log(opt); |
3eefc189 | 929 | shown = 1; |
5f1c3f07 | 930 | } |
1b32dece | 931 | if (opt->track_linear && !opt->linear && opt->reverse_output_stage) |
4d7b0efc | 932 | fprintf(opt->diffopt.file, "\n%s\n", opt->break_bar); |
91539833 | 933 | opt->loginfo = NULL; |
4d7b0efc | 934 | maybe_flush_or_die(opt->diffopt.file, "stdout"); |
6ea57703 JS |
935 | if (close_file) |
936 | fclose(opt->diffopt.file); | |
3eefc189 | 937 | return shown; |
5f1c3f07 | 938 | } |