summaryrefslogtreecommitdiff
path: root/log-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-11-30 04:27:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-11-30 04:47:55 (GMT)
commitd8981c3f885ceaddfec0e545b0f995b96e5ec58f (patch)
tree7337c0018c55bb91e000b78c8c2b8e973e71e070 /log-tree.c
parent7068cbc4abac53d9c3675dfba81c1e97d25e8eeb (diff)
downloadgit-d8981c3f885ceaddfec0e545b0f995b96e5ec58f.zip
git-d8981c3f885ceaddfec0e545b0f995b96e5ec58f.tar.gz
git-d8981c3f885ceaddfec0e545b0f995b96e5ec58f.tar.bz2
format-patch: do not let its diff-options affect --range-diff
Stop leaking how the primary output of format-patch is customized to the range-diff machinery and instead let the latter use its own "reasonable default", in order to correct the breakage introduced by a5170794 ("Merge branch 'ab/range-diff-no-patch'", 2018-11-18) on the 'master' front. "git format-patch --range-diff..." without any weird diff option started to include the "range-diff --stat" output, which is rather useless right now, that made the whole thing unusable and this is probably the least disruptive way to whip the codebase into a shippable shape. We may want to later make the range-diff driven by format-patch more configurable, but that would have to wait until we have a good design. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'log-tree.c')
-rw-r--r--log-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/log-tree.c b/log-tree.c
index 7a83e99..b243779 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -762,7 +762,7 @@ void show_log(struct rev_info *opt)
next_commentary_block(opt, NULL);
fprintf_ln(opt->diffopt.file, "%s", opt->rdiff_title);
show_range_diff(opt->rdiff1, opt->rdiff2,
- opt->creation_factor, 1, &opt->diffopt);
+ opt->creation_factor, 1, NULL);
memcpy(&diff_queued_diff, &dq, sizeof(diff_queued_diff));
}