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 /builtin | |
| 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 'builtin')
| -rw-r--r-- | builtin/log.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c index 5ac18e2848..e8e51068bd 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1094,9 +1094,18 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout, } if (rev->rdiff1) { + /* + * Pass minimum required diff-options to range-diff; others + * can be added later if deemed desirable. + */ + struct diff_options opts; + diff_setup(&opts); + opts.file = rev->diffopt.file; + opts.use_color = rev->diffopt.use_color; + diff_setup_done(&opts); fprintf_ln(rev->diffopt.file, "%s", rev->rdiff_title); show_range_diff(rev->rdiff1, rev->rdiff2, - rev->creation_factor, 1, NULL); + rev->creation_factor, 1, &opts); } } |