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>
Jeff King committed
Feb 22, 2019 at 01:21 UTC
40ae3d3eeae95f201d5532cb114266ad8f6d4130
1 file changed
+1
-1
bisect.c
+1
-1
@@ -901,8 +901,8 @@ static void show_diff_tree(struct repository *r,
901
};
902
struct rev_info opt;
903
904
- repo_init_revisions(r, &opt, prefix);
904
git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
905
+ repo_init_revisions(r, &opt, prefix);
906
907
setup_revisions(ARRAY_SIZE(argv) - 1, argv, &opt, NULL);
908
log_tree_commit(&opt, commit);