[PATCH 2/3] bisect: fix internal diff-tree config loading
- From
Jeff King <peff@peff.net>
- Date
- Feb 22, 2019, 06:21 UTC
- Message-ID
- <20190222062133.GB10248@sigill.intra.peff.net>
- In-Reply-To
- <20190222061949.GA9875@sigill.intra.peff.net>
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> --- It does feel a little weird loading config at all here, since it would potentially affect other in-process operations. This is where an external process might be cleaner.
bisect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
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);
-- 2.21.0.rc2.577.g06bbe9cbd1