From: Jeff King <peff@peff.net> Date: Fri, 22 Feb 2019 06:21:33 +0000 (-0500) Subject: bisect: fix internal diff-tree config loading X-Git-Tag: v2.22.0-rc0~143^2~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=40ae3d3eeae95f201d5532cb114266ad8f6d4130;p=git bisect: fix internal diff-tree config loading When we run our internal diff-tree to show the bisected commit, we call init_revisions(), then load config, then setup_revisions(). But that order is wrong: we copy the configured defaults into the rev_info struct during the init_revisions step, so our config load wasn't actually doing anything. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- diff --git a/bisect.c b/bisect.c index 8c81859835..b04d7b2f63 100644 --- a/bisect.c +++ b/bisect.c @@ -901,8 +901,8 @@ static void show_diff_tree(struct repository *r, }; struct rev_info opt; - repo_init_revisions(r, &opt, prefix); git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ + repo_init_revisions(r, &opt, prefix); setup_revisions(ARRAY_SIZE(argv) - 1, argv, &opt, NULL); log_tree_commit(&opt, commit);