diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-12-04 12:49:50 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-12-04 12:49:50 +0900 |
| commit | 965798d1f2992a4bdadb81eba195a7d465b6454a (patch) | |
| tree | 6924453fd098ad4f980cf8d34ef5f9ab9625c6c5 /log-tree.c | |
| parent | Merge branch 'en/rebase-consistency' (diff) | |
| parent | range-diff: always pass at least minimal diff options (diff) | |
| download | tgif-965798d1f2992a4bdadb81eba195a7d465b6454a.tar.xz | |
Merge branch 'es/format-patch-range-diff-fix-fix'
* es/format-patch-range-diff-fix-fix:
range-diff: always pass at least minimal diff options
Diffstat (limited to 'log-tree.c')
| -rw-r--r-- | log-tree.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/log-tree.c b/log-tree.c index b243779a0b..10680c139e 100644 --- a/log-tree.c +++ b/log-tree.c @@ -755,14 +755,23 @@ void show_log(struct rev_info *opt) if (cmit_fmt_is_mail(ctx.fmt) && opt->rdiff1) { struct diff_queue_struct dq; + struct diff_options opts; memcpy(&dq, &diff_queued_diff, sizeof(diff_queued_diff)); DIFF_QUEUE_CLEAR(&diff_queued_diff); next_commentary_block(opt, NULL); fprintf_ln(opt->diffopt.file, "%s", opt->rdiff_title); + /* + * Pass minimum required diff-options to range-diff; others + * can be added later if deemed desirable. + */ + diff_setup(&opts); + opts.file = opt->diffopt.file; + opts.use_color = opt->diffopt.use_color; + diff_setup_done(&opts); show_range_diff(opt->rdiff1, opt->rdiff2, - opt->creation_factor, 1, NULL); + opt->creation_factor, 1, &opts); memcpy(&diff_queued_diff, &dq, sizeof(diff_queued_diff)); } |