Commit ac0edf1f authored by Martin Ågren's avatar Martin Ågren Committed by Junio C Hamano

range-diff: always pass at least minimal diff options

Commit d8981c3f ("format-patch: do not let its diff-options affect
--range-diff", 2018-11-30) taught `show_range_diff()` to accept a
NULL-pointer as an indication that it should use its own "reasonable
default". That fixed a regression from a5170794 ("Merge branch
'ab/range-diff-no-patch'", 2018-11-18), but unfortunately it introduced
a regression of its own.

In particular, it means we forget the `file` member of the diff options,
so rather than placing a range-diff in the cover-letter, we write it to
stdout. In order to fix this, rewrite the two callers adjusted by
d8981c3f to instead create a "dummy" set of diff options where they
only fill in the fields we absolutely require, such as output file and
color.

Modify and extend the existing tests to try and verify that the right
contents end up in the right place.

Don't revert `show_range_diff()`, i.e., let it keep accepting NULL.
Rather than removing what is dead code and figuring out it isn't
actually dead and we've broken 2.20, just leave it for now.

[es: retain diff coloring when going to stdout]
Signed-off-by: default avatarMartin Ågren <[email protected]>
Signed-off-by: Eric Sunshine's avatarEric Sunshine <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent d8981c3f
...@@ -1094,9 +1094,18 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout, ...@@ -1094,9 +1094,18 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
} }
if (rev->rdiff1) { 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); fprintf_ln(rev->diffopt.file, "%s", rev->rdiff_title);
show_range_diff(rev->rdiff1, rev->rdiff2, show_range_diff(rev->rdiff1, rev->rdiff2,
rev->creation_factor, 1, NULL); rev->creation_factor, 1, &opts);
} }
} }
......
...@@ -755,14 +755,23 @@ void show_log(struct rev_info *opt) ...@@ -755,14 +755,23 @@ void show_log(struct rev_info *opt)
if (cmit_fmt_is_mail(ctx.fmt) && opt->rdiff1) { if (cmit_fmt_is_mail(ctx.fmt) && opt->rdiff1) {
struct diff_queue_struct dq; struct diff_queue_struct dq;
struct diff_options opts;
memcpy(&dq, &diff_queued_diff, sizeof(diff_queued_diff)); memcpy(&dq, &diff_queued_diff, sizeof(diff_queued_diff));
DIFF_QUEUE_CLEAR(&diff_queued_diff); DIFF_QUEUE_CLEAR(&diff_queued_diff);
next_commentary_block(opt, NULL); next_commentary_block(opt, NULL);
fprintf_ln(opt->diffopt.file, "%s", opt->rdiff_title); 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, 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)); memcpy(&diff_queued_diff, &dq, sizeof(diff_queued_diff));
} }
......
...@@ -248,18 +248,24 @@ test_expect_success 'dual-coloring' ' ...@@ -248,18 +248,24 @@ test_expect_success 'dual-coloring' '
for prev in topic master..topic for prev in topic master..topic
do do
test_expect_success "format-patch --range-diff=$prev" ' test_expect_success "format-patch --range-diff=$prev" '
git format-patch --stdout --cover-letter --range-diff=$prev \ git format-patch --cover-letter --range-diff=$prev \
master..unmodified >actual && master..unmodified >actual &&
grep "= 1: .* s/5/A" actual && test_when_finished "rm 000?-*" &&
grep "= 2: .* s/4/A" actual && test_line_count = 5 actual &&
grep "= 3: .* s/11/B" actual && test_i18ngrep "^Range-diff:$" 0000-* &&
grep "= 4: .* s/12/B" actual grep "= 1: .* s/5/A" 0000-* &&
grep "= 2: .* s/4/A" 0000-* &&
grep "= 3: .* s/11/B" 0000-* &&
grep "= 4: .* s/12/B" 0000-*
' '
done done
test_expect_success 'format-patch --range-diff as commentary' ' test_expect_success 'format-patch --range-diff as commentary' '
git format-patch --stdout --range-diff=HEAD~1 HEAD~1 >actual && git format-patch --range-diff=HEAD~1 HEAD~1 >actual &&
test_i18ngrep "^Range-diff:$" actual test_when_finished "rm 0001-*" &&
test_line_count = 1 actual &&
test_i18ngrep "^Range-diff:$" 0001-* &&
grep "> 1: .* new message" 0001-*
' '
test_done test_done
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment